Commit graph

323 commits

Author SHA1 Message Date
Jeuv
ca392149f8
pt 7 2022-02-05 16:29:34 +01:00
Jeuv
4ec437fc9b
pt 6 2022-02-05 16:13:22 +01:00
Jeuv
95147d703c
Update staff.json 2022-02-05 16:13:19 +01:00
Jeuv
036887dd62
Update spellbook.json 2022-02-05 16:12:19 +01:00
Jeuv
c68ae12c74
Update pigments.json 2022-02-05 16:10:56 +01:00
Jeuv
941e1edce5
Update lens.json 2022-02-05 16:07:32 +01:00
Jeuv
e9eb569112
pt 5 2022-02-05 16:06:01 +01:00
Jeuv
3b9031d42a
Update hexcasting.json 2022-02-05 16:05:12 +01:00
Jeuv
309e825ac5
Update focus.json 2022-02-05 16:00:26 +01:00
Jeuv
442f8170af
Update amethyst.json 2022-02-05 15:56:01 +01:00
Jeuv
8b0f5fe019
oops 2022-02-05 15:52:37 +01:00
Jeuv
f80c1f1a8b
Update the_work.json 2022-02-05 15:51:36 +01:00
Jeuv
645a3e313f
pt 4 2022-02-05 15:49:44 +01:00
Jeuv
6c6ba9f595
Update vectors.json 2022-02-05 15:49:11 +01:00
Jeuv
9887b7b6fc
Update stack.json 2022-02-05 15:46:24 +01:00
Jeuv
ea48940bcb
Update patterns_as_iotas.json 2022-02-05 15:44:15 +01:00
Jeuv
56b3389d55
Update naming.json 2022-02-05 15:39:49 +01:00
Jeuv
8ead70a818
pt 3 2022-02-05 15:37:24 +01:00
Jeuv
de88d24c7b
Update mishaps.json 2022-02-05 15:37:12 +01:00
Jeuv
8f6974a8ac
Update influences.json 2022-02-05 15:35:28 +01:00
Jeuv
fc158d5e1f
Update 101.json 2022-02-05 15:32:09 +01:00
Jeuv
08280cbdcd
pt 2 2022-02-05 15:17:56 +01:00
Jeuv
5c28bf4494
Update start_to_see.json 2022-02-05 15:17:51 +01:00
Jeuv
3fec2c240b
Update media.json 2022-02-05 15:13:37 +01:00
Jeuv
3b4e02b75f
Update geodes.json 2022-02-05 15:11:37 +01:00
Jeuv
34fbe3d5c0
Update couldnt_cast.json 2022-02-05 15:09:31 +01:00
Jeuv
369cd31b29
pt 1 2022-02-05 15:05:02 +01:00
Jeuv
c4a36bf090
Update patterns.json 2022-02-05 15:04:50 +01:00
Jeuv
b527febaee
Update items.json 2022-02-05 15:03:31 +01:00
Jeuv
61713f29d7
Update greatwork.json 2022-02-05 15:02:36 +01:00
Jeuv
d1686060da
Update casting.json 2022-02-05 15:01:05 +01:00
Jeuv
fd846322fc
Update basics.json 2022-02-05 14:59:39 +01:00
Jeuv
1a43114391
Update spells.json 2022-02-05 14:57:23 +01:00
Jeuv
279e022112
Update great_spells.json 2022-02-05 14:55:37 +01:00
Jeuv
1e4f0f9c1d
Delete src/main/resources/data/hexcasting/patchouli_books/thehexbook/nl_nl directory 2022-02-05 14:48:55 +01:00
Jeuv
8e951e2716
Delete nl_nl.json 2022-02-05 14:48:35 +01:00
Jeuv
8ad81b1edd
Merge branch 'gamma-delta:main' into nl_nl 2022-02-05 13:55:34 +01:00
Hudeler
b256e3c773 Fix error message thrown by OpForEach 2022-02-05 08:29:51 +01:00
Hudeler
cb6e1d6a21 Revert "Fix error message thrown by getChecked"
This reverts commit 608c336cb8.
2022-02-05 08:17:20 +01:00
Hudeler
608c336cb8 Fix error message thrown by getChecked 2022-02-05 08:10:02 +01:00
petrak@
bf38034f06
Merge pull request #13 from Hudeler/main
Fix ForEach not adding the element to the stack at the start of each loop
2022-02-05 00:01:00 -06:00
petrak@
b2a7b864c8
Merge pull request #11 from AmyMialee/main
Conjured Lights Update
2022-02-05 00:00:45 -06:00
Hudeler
610e445bbe Fix ForEach not adding the element to the stack at the start of each loop 2022-02-05 05:52:42 +01:00
Jeuv
f731cb820f
vertaling 2022-02-05 03:05:56 +01:00
Jeuv
b5794e545e
vertaling 2022-02-05 03:04:29 +01:00
Jeuv
f021a04590
vertaling 2022-02-04 23:51:20 +01:00
Jeuv
e84d021399
Merge branch 'gamma-delta:main' into nl_nl 2022-02-04 23:38:47 +01:00
Jeuv
565e5b22c5
vertaling 2022-02-04 23:35:42 +01:00
gamma-delta
8f7f9412bc print works on empty stacks and gui stays open with only parens 2022-02-04 12:55:21 -06:00
Jeuv
ee01ad368f
vertaling 2022-02-04 19:55:08 +01:00
Jeuv
a4070d7f1b
Merge branch 'gamma-delta:main' into main 2022-02-04 19:21:48 +01:00
Jeuv
1cc56d5f27
vertaling 2022-02-04 19:17:47 +01:00
Jeuv
2c8921fe72
vertaling 2022-02-04 19:14:32 +01:00
gamma-delta
3d5e991882 colorizers should actually get consumed now 2022-02-04 11:59:12 -06:00
gamma-delta
5aa98c2e8b no longer crash on the server and items can be extracted from the offhand 2022-02-04 11:15:42 -06:00
Jeuv
1a4467fdb0
nl_nl book stuff 2022-02-04 18:14:44 +01:00
Jeuv
bb7b06a59d
yeet 2022-02-04 18:12:21 +01:00
Jeuv
d898982abb
ik vergeet altijd wat 2022-02-04 18:04:39 +01:00
Jeuv
9136940355
Maddy pull update 2022-02-04 18:03:29 +01:00
Jeuv
21fbc735a8
Merge branch 'gamma-delta:main' into main 2022-02-04 17:37:58 +01:00
petrak@
15313ac749
Merge pull request #9 from Noobulus/main
Sammich Buffs, Fisherman's, and Weather, Oh My!
2022-02-04 10:35:14 -06:00
petrak@
5c98da7890
Merge pull request #10 from Jeuvke/translation
Allow localisation of the book name & landing
2022-02-04 10:34:24 -06:00
gamma-delta
6ea6253ecb book more up to date about scrying lenses 2022-02-04 10:33:09 -06:00
gamma-delta
7d9e62a8a8 trinkets/cyphers don't consume mana from inbentory any more 2022-02-04 10:27:53 -06:00
gamma-delta
c15d4cac24 untested, but make the client sync code less bad and make trinkets/cyphers actually unable to draw from inventory 2022-02-04 10:21:20 -06:00
gamma-delta
8cd849d2db finish un-janking colorizers, journal entries should be in first person, get dev user on gh 2022-02-04 09:38:34 -06:00
gamma-delta
74bd0b82b0 fix up colorizers a little more, also push new toml with uuids 2022-02-04 00:37:21 -06:00
AmyMialee
d38b729191 lightsd 2022-02-03 20:45:47 +00:00
Jeuv
a11eb935ac Update book.json
allow translation of the book name and landing text
2022-02-03 00:01:01 +01:00
Jeuv
704a501343 Update en_us.json
allow translation of the book name and landing text
2022-02-03 00:00:53 +01:00
Jeuv
127223a8df
Update en_us.json
allow translation of the book name and landing text
2022-02-02 22:40:41 +01:00
Jeuv
d3f724cca3
Update book.json
allow translation of the book name and landing text
2022-02-02 22:40:34 +01:00
Jeuv
0b32ed4e23
Create geodes.json 2022-02-02 19:49:39 +01:00
Noobulus
aec99753c6 pare things back for 0.5.0 release 2022-02-02 12:48:51 -06:00
Noobulus
62870e3642 Revert "go absolutely ham impling list utils"
This reverts commit 45fc0aae66.
2022-02-02 12:47:40 -06:00
Jeuv
c42a9a91f8
Update spells.json 2022-02-02 19:38:34 +01:00
Jeuv
e148c531f8
Create spells.json 2022-02-02 19:36:22 +01:00
Jeuv
02d0f76732
Delete src/main/resources/data/hexcasting/patchouli_books/thehexbook/categories/patterns directory
fuck
2022-02-02 19:35:43 +01:00
Jeuv
e14e568b5a
Create spells.json 2022-02-02 19:35:10 +01:00
Jeuv
17c346e38d
Update nl_nl.json
pls be good now
2022-02-02 19:14:46 +01:00
Jeuv
66bb42a81c
Update nl_nl.json
I forgor 💀
2022-02-02 19:00:14 +01:00
Jeuv
41b4ab9afe
Update nl_nl.json
*chef's kiss*
2022-02-02 18:57:27 +01:00
Jeuv
e22c9fd0a5
Create nl_nl.json
poging 1
2022-02-02 18:36:41 +01:00
Noobulus
45fc0aae66 go absolutely ham impling list utils 2022-02-01 21:52:49 -06:00
Noobulus
1f6a49d98a clean up imports 2022-02-01 13:54:39 -06:00
Noobulus
379aa6c9fb in which i take an hour to realize i put true where it shouldn't be 2022-02-01 01:45:02 -06:00
Noobulus
e13cf4e3b4 partial summon/dispel rain impl, need to figure out how to make it actually work all the time instead of sometimes 2022-01-31 23:29:03 -06:00
Noobulus
53e813506b been spendin' most their lives livin' in a [Hudeler]'s paradise 2022-01-31 21:30:12 -06:00
Noobulus
01e2224a19 change artifact recipe to use any tagged music disc and buff sub sandwich 2022-01-31 16:41:56 -06:00
Noobulus
34b7086a40 fix missing import for evals 2022-01-31 14:14:32 -06:00
Noobulus
99f64e57fe Impl erase spell 2022-01-31 10:32:36 -06:00
petrak@
020c875151
Merge branch 'main' into main 2022-01-31 09:23:43 -06:00
Alwinfy
425b9b34c6 Fix the icosahedron render 2022-01-31 08:38:51 -06:00
gamma-delta
589f639b3f untested evaluator operators 2022-01-31 08:37:15 -06:00
AmyMialee
ffc5435d69 Consistency with Explosion
And slight rewording.
2022-01-31 04:06:56 +00:00
AmyMialee
904dd05504 Update conjured.json
Prevents weird edge cases of missing particles
2022-01-30 22:01:21 +00:00
AmyMialee
452d8d53dc own colourizer 2022-01-30 21:52:31 +00:00
AmyMialee
591ca2f269 Conjuration 2022-01-30 21:44:31 +00:00
gamma-delta
a70b5b70c1 fix some bugs, most notably corporea index completely flipping out with scrolls 2022-01-30 10:07:42 -06:00
gamma-delta
72f2c662ef finally banged the evaluator into shape, minus a couple rough edges (eval) 2022-01-29 18:14:33 -06:00
gamma-delta
9cf873a40c maybe 1/3 done with reworking the backend 2022-01-28 20:02:36 -06:00
gamma-delta
ecd2e65fad hopefuly, hopefully, caps sync to player 2022-01-28 12:21:59 -06:00
gamma-delta
14e9f2ea9f colorizers seem to work! todo: caps aren't synced properly 2022-01-28 10:06:38 -06:00
gamma-delta
0e833d1ed9 serializing the colorizer item may or may not work its too late to check 2022-01-28 00:48:40 -06:00
gamma-delta
393ad3d1bd doing a rename, push incase i mess it up 2022-01-28 00:24:43 -06:00
gamma-delta
375af95790 push again mostly to get the new toml file 2022-01-27 23:32:49 -06:00
gamma-delta
e555d6da04 100% chance none of this will work, but i need the toml on the server 2022-01-27 21:45:31 -06:00
gamma-delta
52cb5117ae working on colorizers, push to get a contributors.properties on gh 2022-01-27 20:11:11 -06:00
gamma-delta
11050f709b wildly untested greater sentinel 2022-01-27 17:12:33 -06:00
gamma-delta
aea94953a7 implement sentinels! 2022-01-26 21:53:58 -06:00
gamma-delta
65acd401f9 cheapened blink & impulse, pushing for help with sentinel rendering 2022-01-26 18:14:06 -06:00
gamma-delta
13400a36b7 fix wand being upside down 2022-01-25 22:11:37 -06:00
gamma-delta
4e73247536 Clean up @Alwinfy's gradients 2022-01-25 21:58:47 -06:00
Alwinfy
4cc6b3fb73 Gradient rendering 2022-01-25 20:53:02 -06:00
gamma-delta
9f6f0b035e fix hilarious bug where casting flight would murder everyone else in the air on the server 2022-01-25 20:48:05 -06:00
gamma-delta
366e52b5d5 last bit before 0.4.0 2022-01-25 17:23:15 -06:00
gamma-delta
9d6b835165 god if i want to write actual changelogs i need to not change 50k things at once 2022-01-25 16:37:37 -06:00
gamma-delta
70495688f9 patterns are now registered with a name and patchi looks them up instead of duplicating the sig 2022-01-25 00:22:49 -06:00
gamma-delta
66fe122d96 hotfix: make it work on servers 2022-01-23 19:25:03 -06:00
Vincent Lee
e21a3495f9 Hackily fix server crash 2022-01-23 19:22:37 -06:00
gamma-delta
fb2ebc568a new spells get your new spells 2022-01-23 17:20:59 -06:00
gamma-delta
524384f1d5 at the suggestion of alwinfy, change progression a little and make the great spells the one needing scrolls 2022-01-23 14:05:46 -06:00
gamma-delta
6f0bfd029c de-jankify the stroke order show-er dot thing 2022-01-22 22:34:17 -06:00
gamma-delta
343d73aa6a big giant patch! add spell scrolls and per-world patterns, and update mod ID 2022-01-22 21:53:59 -06:00
gamma-delta
4719f80546 gfx help for scrolls 2022-01-22 11:46:48 -06:00
gamma-delta
5608db3ada fix OpIndex not working 2022-01-20 16:52:03 -06:00
gamma-delta
1ea0560085 fix some achievements and the ambiant sound playing too long, and version bump 2022-01-20 16:01:02 -06:00
gamma-delta
41d8179d64 add entry to guide players to enlightenment 2022-01-20 10:21:33 -06:00
gamma-delta
cbd329ca72 document OpEntityRaycast... oops 2022-01-19 22:41:24 -06:00
gamma-delta
ddc32d37cb alwinfy does not know how to do trigonometry 2022-01-19 22:35:51 -06:00
Alwinfy
6b8a832db1 Small visual improvements 2022-01-19 22:26:41 -06:00
gamma-delta
135dd291d8 wade thru integration hell with kotlinforforge 2022-01-19 22:23:19 -06:00
gamma-delta
8fd7487152 i did not figure out loot modifiers 2022-01-19 19:50:10 -06:00
gamma-delta
0b1cb1c521 continue to not understand how loot modifiers work 2022-01-19 19:47:31 -06:00
gamma-delta
1391daf8bc i do not understand loot modifiers 2022-01-19 18:31:33 -06:00
gamma-delta
2d00a0aa16 more bugfixes and patchi cleanups 2022-01-19 17:13:57 -06:00
Alwinfy
26b2d3266d Fix hexagon centering and ring coord bug 2022-01-19 16:05:42 -06:00
gamma-delta
10ef7b7e8a final bugfixes before release 2022-01-19 15:48:11 -06:00
Alwinfy
f33d6d07d3 Book proofread pass 2022-01-18 21:54:08 -06:00
gamma-delta
eed97963b3 me reading my git add output to remember what to put in my commit message [gigachad] 2022-01-18 00:33:29 -06:00
gamma-delta
37c02552e5 add more advancements and some stats 2022-01-17 11:36:04 -06:00
gamma-delta
8fb63beda9 make vectors also don't NaN 2022-01-17 09:07:01 -06:00
gamma-delta
f9ec735085 gitignore didnt catch a vim session file 2022-01-16 22:56:54 -06:00
gamma-delta
349a2e77ef Patchi RD done, minus some stuff @Alwinfy said they would do 2022-01-16 22:54:37 -06:00
gamma-delta
66d30f16d9 a LOT more patchi 2022-01-16 15:58:32 -06:00
gamma-delta
278caa4dec quick commit in case i mess up my sed 2022-01-14 18:35:16 +00:00
gamma-delta
fb019eb4ff more patchi 2022-01-12 18:25:30 -06:00
gamma-delta
be964cdb1c i hate rendering code i hate rendering code 2022-01-11 21:53:41 -06:00
gamma-delta
d20ac6e8f6 trying to add patchi and doing a bad job 2022-01-11 17:28:40 -06:00
gamma-delta
a01f9b15b8 add some quick recipes 2022-01-08 16:15:49 -06:00
gamma-delta
d5697a3e23 add many new spells, some of which even dont have any bugs 2022-01-02 23:15:20 -06:00
gamma-delta
ce9855d5fe add some spells for working with lists, none of which probably work 2022-01-02 10:18:18 -06:00
gamma-delta
9d3a8422d5 mana is now taken directly from amethyst crystals 2022-01-01 18:33:05 -06:00
gamma-delta
88a415c88c add casting items and multiply all mana costs by 1000 2021-12-31 00:02:38 -06:00
gamma-delta
73ac3b4f8d make rendered spells no longer spell data because that was a dumb idea 2021-12-30 19:54:32 -06:00
gamma-delta
9da0470090 some bugfixes, very untested 2021-12-30 18:22:21 -06:00
gamma-delta
11042f3008 3 new spells and fix a bunch of bugs, closes #1 2021-12-30 16:01:38 -06:00
gamma-delta
1a3faecae9 make things actually cost mana 2021-12-29 22:49:20 -06:00
gamma-delta
717516776e get that working 2021-12-29 18:07:01 -06:00
gamma-delta
d2ddf6861d trying to make a better api, pushing for help with subscribe events 2021-12-29 17:12:00 -06:00
gamma-delta
db850be39f fudge OpEntityPos to eye height when cast on a player and fix spellbook in offhand only scrolling in empty mainhand 2021-12-29 01:16:18 -06:00
gamma-delta
ed7bfc5450 make spellcasting happen on a consistent grid 2021-12-29 00:49:16 -06:00
gamma-delta
a60006c10b add a bunch of math operators and make AddMotion actually work 2021-12-28 19:30:51 -06:00
Alwinfy
41f68813d8 Implement a vertex-based lightning effect on nodes TODO: write a shader to make it look fancier 2021-12-28 11:59:46 -06:00
gamma-delta
fd5f1087fd can now save and cast spells from spellbooks! 2021-12-28 01:49:28 -06:00
gamma-delta
57b3b2854c some resources and encapsulating patterns themselves as spelldata 2021-12-28 00:32:35 -06:00
gamma-delta
19467a18bb some reorganizing, add item models, add more operators 2021-12-27 17:08:57 -06:00
gamma-delta
e84858c95a aaaaaaaaaa 2021-12-26 21:24:14 -06:00
gamma-delta
6101ef7fd4 i hate all graphics code 2021-12-26 19:35:37 -06:00
gamma-delta
7794eab704 more like open good luck 2021-12-26 17:35:55 -06:00
gamma-delta
c5c38f7cd8 push for rendering help 2021-12-26 17:09:56 -06:00
gamma-delta
f52880e527 push to get help with matrix-based look->screen calcs 2021-12-25 12:41:07 -06:00
gamma-delta
ef5fd6aa46 original commit 2021-12-25 10:58:16 -06:00