Skip to content

Conversation

PGR-14
Copy link
Contributor

@PGR-14 PGR-14 commented Sep 26, 2025

Summary

Content "Adds bills & revamps the bill-hooks."

Purpose of change

We only had 1 bill, & it was very old & decently outdated.

Describe the solution

Added 7 new weapons/tools.
The bill is essentially just an over glorified machete,
The bill axe just has a longer handle, & more leverage.
The bill pole is a bill mounted on a pole. Doesn't have the hooking weapon flag 'cause a lot of them don't have hooks, or effective ones.
The bill-hook is the actual weapon, based off of the old one.

Describe alternatives you've considered

Reverting the changes or something.

Testing

Additional context

Adds in 7 new items, & recipes for them.
Bill, Bill axe, Bill pole
Bronze Bill, Bronze Bill axe, Bronze Bill pole,
& a new & improved billhook.
@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Spawn Creatures, items, vehicles, locations appearing on map new contributor astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Sep 26, 2025
Copy link
Member

@GuardianDll GuardianDll left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also all the game text needs to have two spaces after the dot, for readability sake
foo bar. Xyz
->
foo bar. Xyz

@PGR-14 PGR-14 marked this pull request as draft September 29, 2025 12:42
PGR-14 and others added 3 commits September 29, 2025 08:43
Fair enough, forgot to remove a lot of my shorthands

Co-authored-by: Anton Simakov <67688115+GuardianDll@users.noreply.github.com>
@PGR-14 PGR-14 marked this pull request as ready for review September 29, 2025 14:23
@GuardianDll
Copy link
Member

@PGR-14
Copy link
Contributor Author

PGR-14 commented Sep 30, 2025

All errors in link shoud be resolved https://github.com/CleverRaven/Cataclysm-DDA/actions/runs/18100304416/job/51572332283?pr=83043#step:19:244

For the double spacin', you told me to do that for readability's sake, & the loadin' errors'll be fixed.

@PGR-14
Copy link
Contributor Author

PGR-14 commented Sep 30, 2025

The errors are fixed now, probably.

@PGR-14
Copy link
Contributor Author

PGR-14 commented Oct 1, 2025

The errors are fixed now, probably.

Nevermind, misread the error log :/.

PGR-14 and others added 3 commits October 1, 2025 08:30
Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com>
Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com>
Copy link
Contributor

github-actions bot commented Oct 1, 2025

Spell checker encountered unrecognized words in the in-game text added in this pull request. See below for details.

Click to expand
  • A nasty set of hooks and spikes set upon a shaft, with a metal endcap. This ain't no gardening tool, and it'll hook someone very easily.
  • The steel curved blade of a bill placed stoutly ontop an axe handle. It still isn't long enough to use as a spear, but it'll still cleave your enemies.

This alert is automatically generated. You can simply disregard if this is inaccurate, or (optionally) you can also add the new words to tools/spell_checker/dictionary.txt so they will not trigger an alert next time.

Hints for adding a new word to the dictionary
  • If the word is normally in all lowercase, such as the noun word or the verb does, add it in its lower-case form; if the word is a proper noun, such as the surname George, add it in its initial-caps form; if the word is an acronym or has special letter case, such as the acronym CDDA or the unit mW, add it by preserving the case of all the letters. A word in the dictionary will also match its initial-caps form (if the word is in all lowercase) and all-uppercase form, so a word should be added to the dictionary in its normal letter case even if used in a different letter case in a sentence.
  • For a word to be added to the dictionary, it should either be a real, properly-spelled modern American English word, a foreign loan word (including romanized foreign names), or a foreign or made-up word that is used consistently and commonly enough in the game. Intentional misspelling (including eye dialect) of a word should not be added unless it has become a common terminology in the game, because while someone may have a legitimate use for it, another person may spell it that way accidentally.

@GuardianDll
Copy link
Member

(~[slow] ~[.],starting_items)=> brush_handaxe (recipe) has two definitions from the same source (dda)!
I am quite sure the bug like this can be catched by opening the game, did you test your changes?

@PGR-14
Copy link
Contributor Author

PGR-14 commented Oct 2, 2025

(~[slow] ~[.],starting_items)=> brush_handaxe (recipe) has two definitions from the same source (dda)! I am quite sure the bug like this can be catched by opening the game, did you test your changes?

I usually do, but since I'm really busy, I'm just lettin' the build checker do it for me.

@GuardianDll
Copy link
Member

GuardianDll commented Oct 2, 2025

https://github.com/CleverRaven/Cataclysm-DDA/actions/runs/18197384656/job/51819442742?pr=83043#step:19:102
That's a pretty terrible test and i will try to get rid of it later, but for a time being, you'd need to do what test asks you to do

@github-actions github-actions bot added the Code: Tests Measurement, self-control, statistics, balancing. label Oct 3, 2025
@GuardianDll
Copy link
Member

You have very selective way of solving unit test errors

@GuardianDll GuardianDll merged commit d850323 into CleverRaven:master Oct 4, 2025
28 checks passed
@PGR-14
Copy link
Contributor Author

PGR-14 commented Oct 4, 2025

You have very selective way of solving unit test errors

Usually I don't, only this time I did.

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Oct 4, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions Code: Tests Measurement, self-control, statistics, balancing. [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions new contributor Spawn Creatures, items, vehicles, locations appearing on map
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants