Anvilcraft/HexCasting
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'gamma-delta:main' into main

Browse source
This commit is contained in:
ChuijkYahus 2023-02-24 16:19:44 +08:00 committed by GitHub
commit 99202a9282
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Common/src/main/java/at/petrak/hexcasting/common/lib/hex/HexActions.java
View file

@ -211,6 +211,8 @@ public class HexActions {
new ActionRegistryEntry(HexPattern.fromAngles("adeeeee", HexDir.NORTH_EAST), OpArcCos.INSTANCE));
public static final ActionRegistryEntry ARCTAN = make("arctan",
new ActionRegistryEntry(HexPattern.fromAngles("eadeeeeew", HexDir.NORTH_EAST), OpArcTan.INSTANCE));
public static final ActionRegistryEntry ARCTAN2 = make("arctan2",
new ActionRegistryEntry(HexPattern.fromAngles("deadeeeeewd", HexDir.WEST), OpArcTan2.INSTANCE));
public static final ActionRegistryEntry LOGARITHM = make("logarithm",
new ActionRegistryEntry(HexPattern.fromAngles("eqaqe", HexDir.NORTH_WEST), OpLog.INSTANCE));
public static final ActionRegistryEntry MODULO = make("modulo",

3
Common/src/main/resources/assets/hexcasting/lang/en_us.json
View file

@ -327,6 +327,7 @@
"hexcasting.action.book.hexcasting:arcsin": "Inverse Sine Prfn.",
"hexcasting.action.book.hexcasting:arccos": "Inverse Cosine Prfn.",
"hexcasting.action.book.hexcasting:arctan": "Inverse Tangent Prfn.",
"hexcasting.action.book.hexcasting:arctan2": "Inverse Tan. Prfn. II",
"hexcasting.action.book.hexcasting:const/vec/x": "Vector Rfln. +X/-X",
"hexcasting.action.book.hexcasting:const/vec/y": "Vector Rfln. +Y/-Y",
"hexcasting.action.book.hexcasting:const/vec/z": "Vector Rfln. +Z/-Z",
@ -445,6 +446,7 @@
"hexcasting.action.hexcasting:arcsin": "Inverse Sine Purification",
"hexcasting.action.hexcasting:arccos": "Inverse Cosine Purification",
"hexcasting.action.hexcasting:arctan": "Inverse Tangent Purification",
"hexcasting.action.hexcasting:arctan2": "Inverse Tangent Purification II",
"hexcasting.action.hexcasting:random": "Entropy Reflection",
"hexcasting.action.hexcasting:logarithm": "Logarithmic Distillation",
"hexcasting.action.hexcasting:coerce_axial": "Axial Purification",
@ -952,6 +954,7 @@
"hexcasting.page.advanced_math.arcsin": "Takes the inverse sine of a value with absolute value 1 or less, yielding the angle whose sine is that value. Related to the values of $(l:patterns/consts#hexcasting:const/double/pi)$(thing)π/$ and $(l:patterns/consts#hexcasting:const/double/tau)$(thing)τ/$.",
"hexcasting.page.advanced_math.arccos": "Takes the inverse cosine of a value with absolute value 1 or less, yielding the angle whose cosine is that value. Related to the values of $(l:patterns/consts#hexcasting:const/double/pi)$(thing)π/$ and $(l:patterns/consts#hexcasting:const/double/tau)$(thing)τ/$.",
"hexcasting.page.advanced_math.arctan": "Takes the inverse tangent of a value, yielding the angle whose tangent is that value. Related to the values of $(l:patterns/consts#hexcasting:const/double/pi)$(thing)π/$ and $(l:patterns/consts#hexcasting:const/double/tau)$(thing)τ/$.",
"hexcasting.page.advanced_math.arctan2": "Takes the inverse tangent of a Y and X value, yielding the angle between the X-axis and a line from the origin to that point.",
"hexcasting.page.advanced_math.logarithm": "Removes the number at the top of the stack, then takes the logarithm of the number at the top using the other number as its base. Related to the value of $(l:patterns/consts#hexcasting:const/double/e)$(thing)$(italic)e/$.",
"hexcasting.entry.sets": "Sets",

8
Common/src/main/resources/data/hexcasting/patchouli_books/thehexbook/en_us/entries/patterns/advanced_math.json
View file

@ -54,6 +54,14 @@
"output": "num",
"text": "hexcasting.page.advanced_math.arctan"
},
{
"type": "hexcasting:pattern",
"op_id": "hexcasting:arctan2",
"anchor": "hexcasting:arctan2",
"input": "num, num",
"output": "num",
"text": "hexcasting.page.advanced_math.arctan2"
},
{
"type": "hexcasting:pattern",
"op_id": "hexcasting:logarithm",