Skip to content

Comments

orcpub#265

Open
sandmanemp wants to merge 842 commits intolarrychristensen:masterfrom
Orcpub:develop
Open

orcpub#265
sandmanemp wants to merge 842 commits intolarrychristensen:masterfrom
Orcpub:develop

Conversation

@sandmanemp
Copy link

https://github.com/Orcpub/orcpub/tree/develop/.ebextensihttps://github.com/Orcpub/orcpub/tree/develop/.expoonshttps://github.com/Orcpub/orcpub/trhttps://github.com/Orcpub/orcpub/tree/develop/assetsee/develop/.githubhttps://github.com/Orcpub/orcpub/tree/develop/bin/wkhtmltoxhttps://github.com/Orcpub/orcpub/tree/develop/deployhttps://github.com/Orcpub/orcpub/tree/develop/devhttps://github.com/Orcpub/orcpub/tree/develop/dockerhttps://github.com/Orcpub/orcpub/tree/develop/ehttps://github.com/Orcpub/orcpub/tree/develop/jsnvhttps://github.com/Orcpub/orcpub/tree/develop/native/cljs/orcpubhttps://github.com/Orcpub/orcpub/tree/develop/resourceshttps://github.com/Orcpub/orcpub/tree/develop/srchttps://github.com/Orcpub/orcpub/tree/develop/testhttps://github.com/Orcpub/orcpub/tree/develop/web/cljs/orcpubhttps://github.com/Orcpub/orcpub/blob/develop/.babelrchttps://github.com/Orcpub/orcpub/blob/develop/.dockerignorehttps://github.com/Orcpub/orcpub/blob/develop/.gitignorehttps://github.com/Orcpub/orcpub/blob/develop/.grenrc.jshttps://github.com/Orcpub/orcpub/blob/develop/.gitignorehttps://github.com/Orcpub/orcpub/blob/develop/.grenrc.jshttps://github.com/Orcpub/orcpub/blob/develop/.js-modules.ednhttps://github.com/Orcpub/orcpub/blob/develop/.grenrc.jshttps://github.com/Orcpub/orcpub/blob/develop/.travis.https://github.com/Orcpub/orcpub/blob/develop/LICENSEymlhttps://github.com/Orcpub/orcpub/blob/develop/Procfilehttps://github.com/Orcpub/orcpub/blob/develop/README.mdhttps://github.com/Orcpub/orcpub/blob/develop/docker-compose-build.yamlhttps://github.com/Orcpub/orcpub/blob/develop/docker-compose-build.yamlhttps://github.com/Orcpub/orcpub/blob/develop/exp.jsonhttps://github.com/Orcpub/orcpub/blob/develop/main.jshttps://github.com/Orcpub/orcpub/blob/develop/exp.jsonhttps://github.com/Orcpub/orcpub/blob/develop/main.jshttps://github.com/Orcpub/orcpub/blob/develop/package.jsonhttps://github.com/Orcpub/orcpub/blob/develop/project.clj

datdamnzotz and others added 30 commits December 28, 2020 17:25
Added Force a scroll to top of page on builders
Add length to 64 for suffix.
src\cljc\orcpub\dice.cljc:42:17: warning: Single arg use of or always returns the arg itself
src\cljc\orcpub\dice.cljc:60:17: warning: Single arg use of or always returns the arg itself
Fixes #504 [Bug] Email address validator doesn't comply with new TLD
…_working

Fix for #505 Initiative button not working
WARNING:  breaks existing name keys for the various Wands of the War Mage

+ Introduce new generic function for creating 

+ Added some missing "action" blurbs

+ Fixes possible typo in `from-internal-item` properties

+ Automatic EOL changes to fit file format
* Added `?melee-damage-bonus-fns` and `?ranged-damage-bonus-fns`to damage modifier calculation

* Added checking for one-handedness to apply Dueling Fighting Style Bonus
    + Correctly applies only to melee
    - TODO filter application of bonus to only one handed weapons

* Added new method `melee-damage-bonus-fn` to handle generic, conditional, damage bonuses

* Added boolean method `bow?` for checking if (long|short) bow, basically. Matches other weapon boolean checks.

* Incidental EOL change in `weapons.cljc` to LF
* Fixed Dueling style not applying +2 bonus to one handed melee weapons.
    + Properly checks for weapons in only one hand
    + Properly only applies to non-two handed melee weapons

* Commented out melee- and ranged- specific damage bonus methods. Weird front end issues occurred when `apply` was... applied to those maps plus the map for the generic `damage-bonus-fns`
    * Properly utilizing the passed functions and conditions should eliminate the need for those other two methods.

* Fixed Bracers of Archery applying attack bonus instead of damage bonus
    * Added new method `weapon-damage-bonus-mod` which duplicates almost all the code from `weapon-attack-bonus-mod`. Combining them may be worthwhile, using a third parameter to set which bonus we want, or even both.
Fixes #508 wand of the war mage missing bonuses
…chery

Fixes #249, Fixes#514, Fixes #513; dueling FS, bracers archery
…-Fix-#517

PDF Ghosting (duplicate fields) Issue #517 and Add option to Print DC/Mod #521
github-actions and others added 30 commits February 19, 2026 18:03
- Rename :if to :missing-else-branch (correct clj-kondo linter name)
- Add :clojure-lsp/unused-public-var :exclude for 5 live vars that LSP
  can't trace (cross-file macro refs, test-only callers)
- Add :exclude-when-defined-by for re-frame reg-event-db, reg-event-fx,
  reg-sub, reg-sub-raw (keyword dispatch is invisible to LSP)
#_ discard 43 dead vars:
- common.cljc (4): ptime, hours-per-day, rounds-to-hours, rounds-to-minutes
- character.cljc (6): add-namespaces + 2 cascade helpers, base-climbing-speed,
  saving-throw-advantages, max-armor-class
- classes.cljc (4): blessings-of-knowledge-skill, spell-level-to-cleric-level,
  spell-in-spells-known?, pact-weapon-option
- options.cljc (15): deprecated ua/scag refs (skill-or-expertise-selection,
  subclass-plugin, subclass-cantrip-selection, druid-cantrip-selection,
  eldritch-invocation-option, deep-gnome-option-cfg, subrace-prereq),
  #_ template refs (add-sources, artisans-tools-choice-cfg), zero-caller
  defs (levels, key-to-name, any-language-selection, charge-summary,
  defensive-duelist-summary, ability-modifiers, subclass-level-option)
- template.cljc (14): ability roller UI (6 fns + score-costs + point-buy-points),
  amazon frames (3), content-list, custom-race-builder;
  #_ subscribe/dispatch refers (no live callers remain)

Redundant expression fixes:
- classes.cljc: remove nested (str (str ...))
- options.cljc: flatten (and (and ...)) in dual-wield checks,
  remove duplicate source destructuring param
#_ discard 49 dead vars:
- views.cljs (25): style defs (header-tab-style, desktop-menu-item-style,
  search-icon-style, transparent-search-input-style, row-style, light-row-style,
  list-style, thumbnail-style, summary-style, option-pack-styles, invalid-styling),
  duplicate constants (rounds-per-minute, minutes-per-hour, hours-per-day),
  superseded components (srd-link, realize-char, svg-icon-section, compare-spell,
  equipment-section, default-image, select-builder-field, text-field,
  subrace-damage-resistance, selection-selector, no-https-images)
- events.cljs (22): dead defs (max-iterations, dnd-5e-characters-path,
  validate-registration, set-active-tabs, remove-subtypes), 17 never-dispatched
  reg-event-db/fx handlers (toggle-public, load-characters, hide-warning,
  open-orcacle, set-builder-item, set-spell-list, set-feature-prop,
  toggle-feat-selection, toggle-*-value-prop, toggle-*-map-prop, etc.);
  remove unused tab-path refer
- db.cljs (1): musical-instrument-choice-cfg (duplicate of classes.cljc)
- subs.cljs (1): ::char5e/summary reg-sub (never subscribed to)

Redundant expression fixes:
- views.cljs: remove (str ...) wrapping bare strings
- character_builder.cljs: remove (str "CLICK HERE...") on 4 string literals
- events.cljs: remove (str "all-content.orcbrew") on 2 string literals
- Conflict resolution modal: migrate inline styles to Garden CSS classes
  (.conflict-*, .export-issue-*) with color-coded radio options
  (cyan/rename, orange/keep, purple/skip)
- Import log: split single changes section into grouped collapsible
  sections (Key Renames, Field Fixes, Data Cleanup, Advanced Details)
- Field Fixes section now shows per-item detail (which fields filled,
  traits named, options fixed)
- handle-api-response HOF in events.cljs: centralizes HTTP status
  dispatch with sensible 401/500 defaults and catch-all console logging,
  replacing bare case statements across 7 API subscriptions
- Fix "Renamed key nil -> nil" display: unify on :from/:to field names
  across events.cljs, import_validation.cljs, and import_log.cljs
…ure/error-handling-import-validation

# Conflicts:
#	.clj-kondo/config.edn
#	src/clj/orcpub/email.clj
#	src/cljc/orcpub/pdf_spec.cljc
#	src/cljs/orcpub/dnd/e5/spell_subs.cljs
#	src/cljs/orcpub/dnd/e5/subs.cljs
#	src/cljs/orcpub/dnd/e5/views.cljs
…/error-handling-import-validation

# Conflicts:
#	.clj-kondo/config.edn
#	src/cljs/orcpub/dnd/e5/events.cljs
#	src/cljs/orcpub/dnd/e5/views.cljs
…t str

- views.cljs: let body was at wrong indent level causing unmatched paren
  (cascaded into ~20 false inline-def warnings from kondo)
- options.cljc: key-to-name was incorrectly commented out by dead-code
  branch but is still called by language-selection
- views.cljs: remove redundant nested str in spell subheader
Add LSP false-positive suppression from lint-dead-code branch:
exclude-when-defined-by for re-frame registrations, specific var
exclusions for cross-file macro references. Ensures both lint
branches share identical kondo config to avoid merge conflicts.
Removed broken with-conn lint-as, added orcpub.errors unresolved-var
exclude, added spell_subs cross-file refs to unused-public-var exclude.
Merge the top-level :clojure-lsp/unused-public-var into the :linters
section where clj-kondo actually reads it. Add missing settings from
the lint-missing-else branch: :output exclude-files, garden.selectors
unresolved-var, read-string exclude, folder-test/with-conn lint-as,
and :missing-else-branch :warning.
Removed broken with-conn lint-as, added orcpub.errors unresolved-var
exclude, added spell_subs cross-file refs to unused-public-var exclude.
Reorganize .clj-kondo/config.edn into single exclude list with
explanatory comments. Narrow test :refer :all to explicit imports
and remove unused requires across test files.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Remove unnecessary (str "literal") wrappers across src files,
drop orphaned empty map in registration.cljc, and clean up
unused refer in routes.clj.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
…ions

- routes.clj: wrap bare destructuring in let (was silently returning nil)
- template_base.cljc: flatten nested + in AC calculation
- magic_items_test: fix argument order in (= (:base-ac 12 x))
- character_test: disable broken round-trip test with TODO (upstream bug)
- entity_spec_test: if→when for implicit nil branch
- pdf_test: remove shadowing docstring from deftest
- favored_enemy_language_test: flatten nested let bindings

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
lint: replace 591 if-without-else with when/when-let/when-not
The def was incorrectly marked as dead code, but the legal footer
in main-page still references it. Remove the #_ reader discard and
the stale "dead" comment.
lint: dead code cleanup + redundant expression fixes
…ling-import-validation

# Conflicts:
#	src/cljs/orcpub/dnd/e5/views.cljs
…validation

Error handling, import validation, and code quality improvements
Auto-detects the tech stack by checking for dev.cljs.edn (figwheel-main
sentinel file). PRs from breaking/2026-stack-modernization get Java 21 +
fig:build + Datomic Pro download. PRs from develop-based branches get
Java 8 + cljsbuild.

Also makes Docker Integration gracefully skip container tests when
orcpub/orcpub:latest is unavailable on Docker Hub — script validation
(shellcheck, .env) still runs and the check passes green.
ci: dual-stack detection for Java 8 and Java 21 branches
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.

7 participants