Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge master into branch #1383

Merged
merged 6 commits into from
Dec 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
run: sudo apt-get install libxml2-utils
- name: Install ruby gem dependencies with bundler
run: |
gem install bundler
gem install bundler -v 2.4.22
bundle config path vendor/bundle
bundle install --jobs 4 --retry 3
- name: Run type data migrations to create gameobj-data.xml
Expand Down
5 changes: 4 additions & 1 deletion scripts/kswole.lic
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,14 @@
name: kswole
game: Gemstone
tags: kroderine soul, feat absorb, feat dispel
version: 1.0.2
version: 1.0.3

Help Contribute: https://github.com/elanthia-online/scripts

Version Control:
Major_change.feature_addition.bugfix
v1.0.3 (2023-12-17)
- Adding support for strandweaver in The Hive
v1.0.2 (2023-12-09)
- Adding support for Faethyl Bog in Ta'Vaalor
- Adding support for The Hive in Zul Logoth
Expand Down Expand Up @@ -159,6 +161,7 @@ class KSwole
/^(?:.*) whispers an inhuman entreaty, and the shadows grow frenized and green-tinged around (?:him|her)\./,
# The Hive, Zul Logoth
/^(?:.*) clumsily twists (?:her|his) palsied hands into a spell form, (?:her|his) fingers trailing waves of psionic energy\./,
/^(?:.*) weaves complex threads of raw mana with (?:her|his) pale legs\./,
)

@dispelable_debuffs = [
Expand Down
1 change: 1 addition & 0 deletions type_data/migrations/45_hinterwilds.rb
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
insert(:name, %{dull griseous mournstone})
insert(:name, %{faceted wyrm's-heart sapphire})
insert(:name, %{fossilized undandsormr egg})
insert(:name, %{fossilized undansormr egg})
insert(:name, %{frosted pale violet amethyst})
insert(:name, %{gold-banded onyx})
insert(:name, %{gold-green auroral emerald})
Expand Down
Loading