Skip to content

Reword the Combat & Danger guide and match it to Main - #304

Merged
XxFran10xX merged 5 commits into
mainfrom
combat
Oct 23, 2026
Merged

XxFran10xX merged 5 commits into
mainfrom
combat

Conversation

@XxFran10xX

@XxFran10xX XxFran10xX commented Oct 23, 2026 •

Copy link
Copy Markdown
Contributor

Rewrites the Combat & Danger section of the guide for new players and fixes what had drifted from Main. Facts were checked against the jars running on Main (GunsAndGadgets 2.1.1, Infestations 0.3.2, Thievery 1.8.3, Games 0.7.1) and Main's plugin configs.

Section changes

  • New page: Locks & Keys (/wiki/locks). Locking doors, container and display settings, and key copies are for every player, so they move out of Thievery. Thievery now only covers thieves and bandits.
  • Games is now Card Games (/wiki/card-games) under Society & Economy: card tables are about money, not combat. /wiki/games redirects there (308).
  • Combat & Danger now holds Guns & Gunsmithing, Infestations, Locks & Keys and Thievery.

Guns & Gunsmithing

  • Anyone can build a gun; only a Musketeer can fire it. Part recipes now show just the Smith perk, not "Musketeer + Smith".
  • The assembly flow was wrong: the menu opens on a rifle, the top-left button changes type, and each slot is chosen by clicking it (no placing parts in order).
  • Added loading and firing as they really work: reload only when empty, moving slows it, sneak + right-click chooses the next ammo, only one gun of each type stays loaded, rockets hurt the shooter and never break blocks.
  • The 21 recipe cards and 24 ammo cards are replaced by a parts table (fits, perk, cost, what it does) and one ammo table (rounds per ingot by metal). Steamlock and Arclock notes fixed: the Steamlock fires only plain Iron Shot, the Arclock fires Bronze or Mythril Shot (powered too). Unrendered ammo stats removed from the data file.

Infestations

  • There is no time limit on a Lure: the 120 s only paces the wave. Leaving doesn't end it either: joined players who leave lose a heart a second until they return or type /lure leave (now listed; the page said players have no commands).
  • Added the Lure recipe (Block Station, 2 Oak Planks), wave sizes per level, the four levels, worsening and spreading back into cleared provinces, the monsters, and the restart rule.

Locks & Keys

  • New containers start Public, not Private. Armour stands, item frames, artifact displays and pedestals use the same four settings.
  • Copper and other non-iron doors can be locked; iron ones can't. The mold is used up when you make a Copper Key; paper keys can't lock or unlock. Added the Key Chain, hoppers, double chests, and the owner-online rule for picking.

Thievery

  • Graves never needed a lockpick: only a Bandit who killed the owner can rob a locked grave, in one click.
  • Chests use the tumbler ring and the hidden-pin search, not the 20-slot bar. Displays need a Strong Lockpick and pay out straight into your inventory.
  • Pickpocketing has a jump minigame first and shows only the main inventory; the victim hears rummaging rather than seeing a subtitle.
  • Added how to become a Thief or Bandit, evil RP sessions, the loadout, per-victim and per-container cooldowns, and what clues are left where. Risk, chance and strength numbers and steal budgets are left out.

Card Games

  • Blackjack tables are guild tables: only a guild leader with a free Auto Dealer Tables slot can place one, and the guild bank is the house.
  • Hold'em blinds are taken automatically (the page said "advisory only"); Five-Draw has no blinds. Hold'em also opens an options menu.
  • Walking off at Blackjack mid-round loses your bet. Only the owner can take the Free play pot.
  • Placement is instant on the clicked block (no "click the spot" step), and you pick a table up by punching the deck.
  • Added how to get a Deck of Cards, which coins count and how to withdraw them, tournaments, allin, and the wager vote rule.

Classes

  • One line fixed: it said Musketeers "build firearms" and called the page Guns and Gadgets. Now: only Musketeers can fire guns (see Guns & Gunsmithing).

Coordinated with #301, #302 and #303 so all four squash-merge cleanly in any order: this PR no longer carries search-index.json (#303 regenerates it from the combined build), the Gunsmithing Station blurb (#303 owns stations.ts) or the Society nav blurb (#302).

Follow-up from fran's answers (plugin fixes released and staged on Main for the next restart: Games 0.7.2, Infestations 0.3.3, Thievery 1.9.0): anyone with a lockpick can pick a door; Bandits can use the loadout too; a joined player who stays logged out past the 5-minute grace drops out of the Lure fight and still dies on that character's next login unless the others win; mob drops are not named; Card Games no longer spells out standard rules.

Checks: oxfmt/oxlint clean on the changed files, the wiki, components and scripts Vitest suites pass (29 files), the production build passes, and validate-live-wiki.mjs reports 0 failures.

Preview: https://combat.tfminecraft.net/wiki/locks

🤖 Generated with Claude Code

@coderabbitai

coderabbitai Bot commented Oct 23, 2026 •

Copy link
Copy Markdown

Important

  • 🔍 Trigger review

This repository does not receive automatic reviews because it has fewer than 10 stars.

⚙️ Run configuration
  • Source mode: Auto
  • Repository: Unavailable
  • Branch: Unavailable
  • File: No configuration file from this repository applied
  • Commit: Unavailable
  • Layers: Organization UI
  • Review profile: CHILL
  • Plan: Advanced
  • Run ID: f7e59e71-1eea-49ec-9795-1a9044066a55
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

XxFran10xX and others added 2 commits October 23, 2026 16:18
Checked every page in the section against the plugin versions and configs on
Main and rewrote them for new players. Locking moves out of Thievery into a
new Locks & Keys page, and Games becomes Card Games under Society & Economy
(/wiki/games redirects).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Also say on Classes that only Musketeers fire guns, matching the new Guns page.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Anyone with a lockpick can pick a door, infestation drops are not named, and
Card Games keeps only what is specific to the server's tables.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…wiki PRs

#303 owns stations.ts and carries the search index, #302 owns the Society
blurb (which now mentions card games), and the locks import moves next to
thievery so it doesn't touch the lines #301 and #302 change.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
XxFran10xX added a commit that referenced this pull request Oct 23, 2026
…a file

The Reference rewrite (#303) regenerates every station recipe, including the
five Sealed Artifact crafts, so this PR no longer splices them in or changes
the recipe counts. The sealed table reads the recipes without throwing and
fills once #303 is merged. Mage Weapons moves to data/mage-weapons.ts so its
registry import sits away from the lines #302 and #304 change. The station
blurb and search index are left to #303.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Thievery 1.9.0 opens the loadout to Bandits, and Infestations 0.3.3 takes a
joined player out of the fight once their logout grace runs out.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
XxFran10xX added a commit that referenced this pull request Oct 23, 2026
The economy, factions, instruments, games, infestations and thievery command
fixes move to #302 and #304, which own those pages, and codex.ts stays with
#301. The two redirects move up beside the Drink Builder redirect so they
don't touch the lines #302 and #304 add.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
XxFran10xX added a commit that referenced this pull request Oct 23, 2026
#303 owns stations.ts and carries the search index, so both go back to main's
version here. The Society blurb now mentions card games, which #304 moves into
this category.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
XxFran10xX added a commit that referenced this pull request Oct 23, 2026
Built from the combined result of #301, #302, #303 and #304, so the index
already lists every page those PRs add, rename or remove. This PR is the only
one of the four that carries the index, so they merge in any order. Vehicle
pages keep main's entries because a rebuild only changes their build date.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
XxFran10xX added a commit that referenced this pull request Oct 23, 2026
* Rewrite the Reference wiki pages to match Main

Materials, Crafting Stations and the Command Index were checked against
Main's live configs and plugins (read only) on 2026-10-23.

- Regenerate station recipes, item names and textures from Main.
- Materials: group the index by type, give every material a source or
  its station recipe, drop items no player can get, and move mage
  weapon part costs to the Magic Station.
- Stations: plain "Getting one / Using it / Recipes" pages, fixed
  blurbs, a grouped index table, and the missing Woodworking Station.
- Command Index: grouped by topic, and fix wrong command rows in the
  sections it lists.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* Show the real perk and item on station recipes, and tidy repeats

- Recipe cards show the perk tier a recipe really checks and spell
  Tree Crafter right, and name Refined Elderwood and Demonwood where
  Main's labels say Refined Maplewood.
- Explain mage weapon part costs once on the Magic Station instead of
  on every card, and drop station notes that repeat "Using it".
- Add the Woodworking Station thumbnail.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* List raw materials first and drop two misleading item links

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* Fix Stone Core, mercenary hire and vehicle build-time wording

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* Show the Sealed Artifact crafts and keep part costs out of magic.ts

fran cleared Sealed Artifact crafts for the wiki on #301, so the
generator no longer hides them and picks up their saved sprites. Mage
weapon part costs move to their own module registered with the
stations, leaving magic.ts and the Magic page to #301.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* Keep the Alloy Forge lava-bucket step and match #301's Codex row

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* Add act material sources, poker and espionage commands

Per fran's answers on #303:
- Tin and Abyssalite Fragment list their current sources; Mythril
  Fragment and Mythrilite say they come in a later act.
- Ignitium also lists activity rewards, infestations, world bosses and
  faction battles.
- Perfect Quality Leather also comes from 5-star goats.
- Poker tournament and SimpleFactions espionage commands are listed.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* Drop goats from Perfect Quality Leather: Main's goats only give wool

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* Leave other sections' command rows and the Codex data to their own PRs

The economy, factions, instruments, games, infestations and thievery command
fixes move to #302 and #304, which own those pages, and codex.ts stays with
#301. The two redirects move up beside the Drink Builder redirect so they
don't touch the lines #302 and #304 add.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* Regenerate the wiki search index for all four guide rewrites

Built from the combined result of #301, #302, #303 and #304, so the index
already lists every page those PRs add, rename or remove. This PR is the only
one of the four that carries the index, so they merge in any order. Vehicle
pages keep main's entries because a rebuild only changes their build date.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

---------

Co-authored-by: XxFran10xX <318299142+XxFran10xX@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
XxFran10xX added a commit that referenced this pull request Oct 23, 2026
* Reword the Magic & Knowledge guide and match it to Main

Checked every page in the section against Magic 0.12.2, Research 1.4.0,
Codex 2.14.0 and GeigerCounters 2.4.0 and their live configs on Main, and
rewrote the copy in plain language. Weapon building, charging and casting
moved from Magic to a new Mage Weapons page. Hidden values (orb counts,
Rift per orb, gains per hit, research thresholds, detector distances) are
left out, and the unused research aspect table is removed.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* Let the rune slot column wrap on phones

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* Fix review notes on the Magic & Knowledge pages

Explain the detector's close-range reset, keep the artifact sharing window
unstated, say which Codex entries show dates and percentages, and format
the Mage Weapons page.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* Refresh the search index for the Magic & Knowledge pages

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* List the sealed artifact crafts and drop hidden tier thresholds

The Rune Station section now shows the five sealed artifact crafts, and the
Magic page no longer gives the Resonance number behind each tier, which the
game never shows.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* Refresh the search index for the sealed artifact crafts

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* Leave the generated recipes to #303 and give Mage Weapons its own data file

The Reference rewrite (#303) regenerates every station recipe, including the
five Sealed Artifact crafts, so this PR no longer splices them in or changes
the recipe counts. The sealed table reads the recipes without throwing and
fills once #303 is merged. Mage Weapons moves to data/mage-weapons.ts so its
registry import sits away from the lines #302 and #304 change. The station
blurb and search index are left to #303.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

---------

Co-authored-by: XxFran10xX <318299142+XxFran10xX@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
XxFran10xX added a commit that referenced this pull request Oct 23, 2026
* Rewrite the Society & Economy guide to match Main

Checked every page against the plugin versions and configs running on Main
(DenarEconomy 0.7.1, MarketBlock 0.2.1, SimpleFactions 4.14.2, ArmourShop
1.1.19, MusicalInstruments 3.4.1) and rewrote them in plain language.

Market Block moves into the money page (/wiki/market-blocks redirects there),
and Factions is split into Factions, Guilds & Trade, and War & Mercenaries.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* Tighten the Factions intro and drop a repeated pouch rule from War

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* Fix Sol review points on reparations, guild capitals and music commands

Reparations follow a lost war and come from the guilds' trade income,
/guild setcapital needs a name to found a settlement, and the music
command list now covers every player command with the right hand for
each disc. The tempo only changes the metronome, and the daily limit
counts new song editions.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* Add mercenary slot upkeep and the signing place, and fix the publish limit

Company places cost the host guild 8 d a day each, hiring factions sign at
the company's guild capital, and the daily publish limit counts new or
changed versions per account over any 24 hours.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* Explain the Spymaster and say anyone can craft instruments

fran confirmed instrument crafting needs no class, and asked for a player-level
Spymaster section: appointment, build-up, what it hides on Main, daily reports
and sharing. The private sabotage stays off the guide.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* Say Spymaster sharing opens your own military to partners

Sharing lets the chosen overlord, subjects or allies see your faction's
military exactly up to the chosen quality. It doesn't pass on your reports
about other factions.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* Leave the station blurb and search index to #303 and mention card games

#303 owns stations.ts and carries the search index, so both go back to main's
version here. The Society blurb now mentions card games, which #304 moves into
this category.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* Describe guild leave for SimpleFactions 4.14.3 and add guild offer commands

/guild leave and /guild kick now return you to the faction's main guild, and
/faction leave asks you to leave a guild first. Adds /guild decline, appoint
and lead from #303's checks, and the raid rule against joining from a warband.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

---------

Co-authored-by: XxFran10xX <318299142+XxFran10xX@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@XxFran10xX
XxFran10xX merged commit 501fab3 into main Oct 23, 2026
8 checks passed
@XxFran10xX
XxFran10xX deleted the combat branch October 23, 2026 20:32

This branch was successfully deployed

1 active deployment
preview — 47ddb97f Deployed Oct 23, 2026 by XxFran10xX via deploy #811
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants