diff --git a/mods.json b/mods.json index 4b07959..77b83d5 100644 --- a/mods.json +++ b/mods.json @@ -4,7 +4,7 @@ { "id": "backpack", "name": "Extra Backpack", "description": "An optional native 20-slot extra backpack for every character class.", "author": "zj1022", "version": "1.0.3", "compatibleClientVersions": ["0.5.1-beta"], "kind": "feature", "type": "script", "path": "mods/backpack", "depends": [], "settings": false }, { "id": "fastcampaign", "name": "Fast Campaign", "description": "A faster campaign: 5x kill experience, +50% movement speed, and /fast lists the commands that skip ahead.", "author": "LocalExile", "version": "1.1.3", "compatibleClientVersions": ["0.4.3-beta", "0.5.0-beta", "0.5.1-beta"], "kind": "feature", "type": "project", "path": "mods/fastcampaign", "depends": [], "settings": true }, { "id": "globalchat", "name": "Global Chat", "description": "Talk to other LocalExile players: global, trade and whisper chat go through the LocalExile global chat server.", "author": "JetStream", "version": "1.1.3", "compatibleClientVersions": ["0.4.3-beta", "0.5.0-beta", "0.5.1-beta"], "kind": "feature", "type": "project", "path": "mods/globalchat", "depends": [], "settings": true }, - { "id": "gm-commands", "name": "GM Commands", "description": "The development and testing chat commands: teleport, items, monsters, experience, quest flags, test hits and protocol probes.", "author": "LocalExile", "version": "1.4.0", "compatibleClientVersions": ["0.5.2-beta"], "kind": "feature", "type": "project", "path": "mods/gm-commands", "depends": ["Game"], "settings": false }, + { "id": "gm-commands", "name": "GM Commands", "description": "The development and testing chat commands: teleport, items, monsters, experience, quest flags, test hits and protocol probes.", "author": "LocalExile", "version": "1.4.1", "compatibleClientVersions": ["0.5.2-beta"], "kind": "feature", "type": "project", "path": "mods/gm-commands", "depends": ["Game"], "settings": false }, { "id": "itemquantity", "name": "Item Quantity", "description": "10 times as many item drops from every kill.", "author": "LocalExile", "version": "1.1.3", "compatibleClientVersions": ["0.4.3-beta", "0.5.0-beta", "0.5.1-beta"], "kind": "feature", "type": "project", "path": "mods/itemquantity", "depends": [], "settings": true }, { "id": "itemrarity", "name": "Item Rarity", "description": "10 times the chance of magic, rare and unique equipment.", "author": "LocalExile", "version": "1.1.3", "compatibleClientVersions": ["0.4.3-beta", "0.5.0-beta", "0.5.1-beta"], "kind": "feature", "type": "project", "path": "mods/itemrarity", "depends": [], "settings": true }, { "id": "liveeconomy", "name": "Live Economy", "description": "Faustus's Currency Exchange as a live market: the official Path of Exile leagues' prices, a spread, depth, and orders that fill with time.", "author": "JetStream", "version": "1.1.3", "compatibleClientVersions": ["0.4.3-beta", "0.5.0-beta", "0.5.1-beta"], "kind": "feature", "type": "project", "path": "mods/liveeconomy", "depends": [], "settings": true }, diff --git a/mods/gm-commands/GmCommands.cs b/mods/gm-commands/GmCommands.cs index cdc5bde..e480807 100644 --- a/mods/gm-commands/GmCommands.cs +++ b/mods/gm-commands/GmCommands.cs @@ -1345,12 +1345,14 @@ await SendPlayerMana(remote, stream, ciphers, conn, if (Stats.Key("base_skill_area_of_effect_+%") is not uint stat) throw new ArgumentException("no area of effect stat in the data"); bool off = args[0].Equals("off", StringComparison.OrdinalIgnoreCase); int value = off ? 0 : int.Parse(args[0]); - lock (conn.Monsters) { if (off) conn.PlayerStats.Remove(stat); else conn.PlayerStats[stat] = value; } + // The Righteous Fire burning now, before this command's own sends: the relight below is for that one only. + RighteousFireState? burning; + lock (conn.Monsters) { if (off) conn.PlayerStats.Remove(stat); else conn.PlayerStats[stat] = value; burning = conn.RighteousFire; } await SendPlayerStatSnapshot(remote, stream, ciphers, conn, () => PlayerStatsUpdateAtGate(conn, PlayerStatsWithCleared(conn)), $"0x01b3 stats: base_skill_area_of_effect_+% = {(off ? "the character's own" : value)}"); await SendSkills(remote, stream, ciphers, conn); - bool relit = await RelightRighteousFire(remote, stream, ciphers, conn, "/set_aoe"); + bool relit = await RelightRighteousFire(remote, stream, ciphers, conn, "/set_aoe", burning); await conn.Commands!.Reply((off ? "Increased area of effect: the character's own" : $"Increased area of effect: {value}%") + (relit ? ", Righteous Fire relit" : "")); }) diff --git a/mods/gm-commands/README.md b/mods/gm-commands/README.md index 31e8323..1135a08 100644 --- a/mods/gm-commands/README.md +++ b/mods/gm-commands/README.md @@ -40,7 +40,8 @@ as "Nothingness". Each `mod` is the Mods Id of an affix: a notable, or an "also LocalExile's own dev scripts (the campaign driver, the level generator's tour loop, `client_control.py`) and Waypoint's item crafter send these commands: install this mod for them. -Works with: 1.4.0 needs LocalExile v0.5.2-beta (`/cluster_jewel` uses its `ClusterJewels`, LocalExile/LocalExile#948). 1.3.0 needs LocalExile v0.5.1-beta (`/stash_add` uses LocalExile/LocalExile#891, and the server's monster calls +Works with: 1.4.1 needs the same LocalExile as 1.4.0 (`/god` and `/set_aoe` relight a burning Righteous Fire through its +`RelightRighteousFire`, LocalExile/LocalExile#1070). 1.4.0 needs LocalExile v0.5.2-beta (`/cluster_jewel` uses its `ClusterJewels`, LocalExile/LocalExile#948). 1.3.0 needs LocalExile v0.5.1-beta (`/stash_add` uses LocalExile/LocalExile#891, and the server's monster calls changed). 1.1.3 works with v0.4.3-beta and v0.5.0-beta, not v0.5.1-beta: there its `/spawn_mob` fails and ends the connection. 1.1.2 works with v0.4.3-beta, the first with the client-table API it reads (LocalExile/LocalExile#862). Mods reach what modules reach from v0.4.0-beta (LocalExile/LocalExile#815); not v0.3.0-beta or earlier. diff --git a/mods/gm-commands/Rules.Campaign.cs b/mods/gm-commands/Rules.Campaign.cs index a54afcb..159286b 100644 --- a/mods/gm-commands/Rules.Campaign.cs +++ b/mods/gm-commands/Rules.Campaign.cs @@ -149,11 +149,13 @@ internal static async Task GodCommand(string remote, NetworkStream stream, Conne _ => throw new ArgumentException("on, off or immune"), }; bool immune = on && (mode == "immune" || (mode == "on" && conn.Immune)); - lock (conn.Monsters) conn.Immune = immune; + // The Righteous Fire burning now, before this command's own sends: the relight below is for that one only. + RighteousFireState? burning; + lock (conn.Monsters) { conn.Immune = immune; burning = conn.RighteousFire; } if (immune) ImmuneCharacters[CharacterName(conn)] = true; else ImmuneCharacters.TryRemove(CharacterName(conn), out _); await SetGod(remote, stream, ciphers, conn, on); // A burning Righteous Fire takes its radius when lit: light it again with the new area. - await RelightRighteousFire(remote, stream, ciphers, conn, "/god"); + await RelightRighteousFire(remote, stream, ciphers, conn, "/god", burning); await conn.Commands!.Reply(on ? immune ? "God mode on, immune to damage." : "God mode on." : "God mode off."); } diff --git a/mods/gm-commands/mod.json b/mods/gm-commands/mod.json index 585ea38..2bf8b27 100644 --- a/mods/gm-commands/mod.json +++ b/mods/gm-commands/mod.json @@ -3,7 +3,7 @@ "name": "GM Commands", "description": "The development and testing chat commands: teleport, items, monsters, experience, quest flags, test hits and protocol probes.", "author": "LocalExile", - "version": "1.4.0", + "version": "1.4.1", "compatibleClientVersions": ["0.5.2-beta"], "kind": "feature", "depends": ["Game"]