Compare commits

...

22 Commits

Author SHA1 Message Date
5605760629 test
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2024-03-30 04:08:25 -04:00
44fc8e1fcf test
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
2024-03-30 04:06:40 -04:00
4f6f24952c Has to be an easier way
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
2024-03-30 04:04:28 -04:00
52cb4e23bc test
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
2024-03-30 04:02:03 -04:00
bcbf1c79c1 test
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
2024-03-30 03:58:36 -04:00
4d7e9553ea test
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
2024-03-30 03:54:39 -04:00
b2db3e7f12 test
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
2024-03-30 03:47:12 -04:00
354e4e0907 Yet again
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2024-03-30 03:44:54 -04:00
610e6f6356 First Build 2024-03-30 03:32:41 -04:00
d25a7a6821 Setup Woodpecker CI
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
Setup Woodpecker CI
2024-03-30 03:11:25 -04:00
Matthew Wagner
47bc988b39 Merge pull request #14 from LotJ/nield/galmap-final-fix
Add special starsystems query for mapper
2024-01-20 21:57:41 -10:00
Ian Alden
85e00ea775 Update readme 2024-01-21 00:17:27 -07:00
Ian Alden
1dcf4f0de9 Add special starsystems query for mapper 2024-01-21 00:13:23 -07:00
Matthew Wagner
e779f9940a Merge pull request #13 from LotJ/nield/osay-fix
Fix osay in chat window
2024-01-20 17:11:05 -10:00
Ian Alden
8ee32a20b3 Fix osay in chat window 2024-01-20 19:40:16 -07:00
Matthew Wagner
0d1e5f7695 Merge pull request #12 from LotJ/nield/galaxy-map-fix-2
Fix galaxy map for imms
2024-01-20 11:23:25 -10:00
Ian Alden
56aa040c9b Fix galaxy map for imms 2024-01-20 14:11:55 -07:00
Jonathan Gottfried
2f540f9127 Merge pull request #10 from LotJ/nield/fix-galmap
Fix trigger for galaxy map
2024-01-20 12:49:20 -05:00
Ian Alden
2a53d2fbe1 One more fix 2024-01-20 10:42:08 -07:00
Jonathan Gottfried
e092dbf204 Merge pull request #9 from LotJ/nield/fix-galmap
Nield/fix galmap
2024-01-20 12:34:29 -05:00
Ian Alden
5847f557ad Fix terminating chars 2024-01-20 10:27:36 -07:00
Ian Alden
2b3850ef98 Fix the galaxy map regex 2024-01-20 10:20:31 -07:00
6 changed files with 52 additions and 8 deletions

44
.woodpecker.yaml Normal file
View File

@@ -0,0 +1,44 @@
steps:
- name: build-release
image: alpine
secrets: [GITEA_TOKEN]
when:
- event: push
- branch: main
commands:
- apk add openjdk21
- apk add wget
- apk add tar
- wget https://github.com/demonnic/muddler/releases/download/0.13/muddle-shadow-0.13.tar
- tar -xvf muddle-shadow-0.13.tar
- mv muddle-shadow-0.13/lib/muddle-0.13-all.jar muddle.jar
- java -jar muddle.jar
- name: deploy-build
image: alpine
when:
- event: [push, tag]
environment:
GITEATKN:
from_secret: GITEA_TOKEN
GOTOKEN:
from_secret: GOTIFY_TOKEN
depends_on: build-release
commands:
- apk add tea
- apk add wget
- tea login add --name=temp --url=https://git.vertinext.com/ --token=$GITEATKN
- tea releases create --asset "build/lotj-ui.mpackage" --asset "build/lotj-ui.xml" --tag latest --title "Latest Compiled Release"
- wget "https://gotify.vertinext.com/message?token=$GOTOKEN" --post-data "title=${CI} - ${CI_REPO_NAME}&message=New release ${CI_COMMIT_TAG} built and deployed.&priority=0" -O /dev/null
- name: notify-on-branch-push
image: alpine
when:
- event: push
- status: [success, failure]
environment:
GOTOKEN:
from_secret: GOTIFY_TOKEN
commands:
- apk add wget
- wget "https://gotify.vertinext.com/message?token=$GOTOKEN" --post-data "title=${CI} - ${CI_REPO_NAME}&message=New pipeline running.&priority=0" -O /dev/null

View File

@@ -55,7 +55,7 @@ After creating a Mudlet profile to connect to LOTJ, do the following to add the
## Contributing
The source for this package is structured to use [muddler](https://github.com/demonnic/muddler) to package it into a Mudlet package.
The source for this package is structured to use [muddler](https://github.com/demonnic/muddler) to package it into a Mudlet package. Using version 0.1 is necessary at this time due to some errant behavior by later Muddler versions.
You can, of course, just modify the triggers/aliases/scripts directly within Mudlet if you want to test local changes, but they'll be overwritten if you want to update to future versions of this package.
@@ -64,7 +64,7 @@ To change the source for this package, modify the JSON files and associated Lua
If you have Docker set up, it can be easiest to run a command like this to regenerate the package, from the root of the repository:
```
docker run --rm -it -u $(id -u):$(id -g) -v $PWD:/$PWD -w /$PWD demonnic/muddler
docker run --rm -it -u $(id -u):$(id -g) -v $PWD:/$PWD -w /$PWD demonnic/muddler:0.1
```
If that's a pain, just make a pull request and someone else can generate the package with your changes to make sure they work.

2
mfile
View File

@@ -1,4 +1,4 @@
{
"package": "lotj-ui",
"version": "v2.3.1"
"version": "v2.3.3"
}

View File

@@ -1,5 +1,5 @@
lotj.galaxyMap.resetData()
enableTrigger("galaxy-map-refresh")
send("starsystems", false)
send("starsystems map", false)
send("planets", false)

View File

@@ -19,11 +19,11 @@
"type": "regex"
},
{
"pattern": "^\\(OOC\\) You say '.*'$",
"pattern": "^\\(OSAY\\) You say '.*'$",
"type": "regex"
},
{
"pattern": "^\\(OOC\\) .* says '.*'$",
"pattern": "^\\(OSAY\\) .* says '.*'$",
"type": "regex"
},
{

View File

@@ -172,7 +172,7 @@
"fireLength": 1,
"patterns": [
{
"pattern": "Listing publicly known starsystems:",
"pattern": "Listing known starsystems:",
"type": "substring"
}
],
@@ -181,7 +181,7 @@
"name": "system-line",
"patterns": [
{
"pattern": "^(.*) \\( ([0-9-]+), ([0-9-]+) \\)$",
"pattern": "^(.*)\\s+\\(\\s*([0-9-]+), ([0-9-]+)\\s*\\)$",
"type": "regex"
}
]