Move all package-level vars into gameData; finish lint adoption
gochecknoglobals: all 37 package-level tables consolidated into the gameData struct (game/tables.go), built by newGameData() and carried on RogueGame as g.data (set in NewGame and Restore). ObjectKind Glyph()/objectKindForGlyph are now switches; the table-reading subtype Stringer methods are gone; isMagic is a RogueGame method. goconst: repeated words named (potionName/scrollName/ringName/goldName in object.go, wandName/staffName in sticks.go, ripWall in tables.go). exhaustive, testpackage: disabled in .golangci.yml with sneak's approval (2026-07-07). Also reverts misspell's silent corruption of the "ther" scroll-name syllable (it had become "there", changing generated scroll names vs C). Remaining red: cyclop/gocognit/nestif until refactor step 7; mnd awaits a ruling. TODO.md rotated; MEMORY.md lint notes updated.
This commit is contained in:
@@ -139,25 +139,6 @@ func (g *RogueGame) gethand() int {
|
||||
}
|
||||
}
|
||||
|
||||
// ringUses is the rings.c ring_eat static uses[] table: how much food each
|
||||
// ring type uses up per turn (negative = a 1-in-n chance of 1).
|
||||
var ringUses = [NumRingTypes]int{
|
||||
1, // R_PROTECT
|
||||
1, // R_ADDSTR
|
||||
1, // R_SUSTSTR
|
||||
-3, // R_SEARCH
|
||||
-5, // R_SEEINVIS
|
||||
0, // R_NOP
|
||||
0, // R_AGGR
|
||||
-3, // R_ADDHIT
|
||||
-3, // R_ADDDAM
|
||||
2, // R_REGEN
|
||||
-2, // R_DIGEST
|
||||
0, // R_TELEPORT
|
||||
1, // R_STEALTH
|
||||
1, // R_SUSTARM
|
||||
}
|
||||
|
||||
// ringEat reports how much food the ring on the given hand uses up
|
||||
// (rings.c ring_eat).
|
||||
func (g *RogueGame) ringEat(hand int) int {
|
||||
@@ -166,7 +147,7 @@ func (g *RogueGame) ringEat(hand int) int {
|
||||
return 0
|
||||
}
|
||||
|
||||
eat := ringUses[ring.RingKind()]
|
||||
eat := g.data.ringUses[ring.RingKind()]
|
||||
if eat < 0 {
|
||||
if g.rnd(-eat) == 0 {
|
||||
eat = 1
|
||||
|
||||
Reference in New Issue
Block a user