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

untested evaluator operators

Browse source
This commit is contained in:
gamma-delta 2022-01-31 08:37:15 -06:00
parent a70b5b70c1
commit 589f639b3f
7 changed files with 62 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/at/petrak/hexcasting/common/casting/CastingHarness.kt
View file

@ -122,7 +122,7 @@ class CastingHarness private constructor(
/**
* Apply the functional update.
*/
private fun applyFunctionalData(data: FunctionalData) {
fun applyFunctionalData(data: FunctionalData) {
this.stack.clear()
this.stack.addAll(data.stack)
this.parenCount = data.parenCount

24
src/main/java/at/petrak/hexcasting/common/casting/OperatorSideEffect.kt
View file

@ -63,18 +63,18 @@ sealed class OperatorSideEffect {
harness.ctx.caster,
Random.nextFloat() * 256f,
Vec3.ZERO
) t
harness.ctx.world.sendParticles(
DustParticleOptions(Vector3f(Vec3.fromRGB24(color)), 1f),
position.x,
position.y,
position.z,
1,
0.1,
0.1,
0.1,
0.1,
)
)
harness.ctx.world.sendParticles(
DustParticleOptions(Vector3f(Vec3.fromRGB24(color)), 1f),
position.x,
position.y,
position.z,
1,
0.1,
0.1,
0.1,
0.1,
)
}
return false

2
src/main/java/at/petrak/hexcasting/common/casting/RegisterPatterns.java
View file

@ -5,6 +5,8 @@ import at.petrak.hexcasting.api.Operator;
import at.petrak.hexcasting.api.PatternRegistry;
import at.petrak.hexcasting.api.SpellDatum;
import at.petrak.hexcasting.common.casting.operators.*;
import at.petrak.hexcasting.common.casting.operators.eval.OpEvalDelay;
import at.petrak.hexcasting.common.casting.operators.eval.OpForEach;
import at.petrak.hexcasting.common.casting.operators.lists.OpAppend;
import at.petrak.hexcasting.common.casting.operators.lists.OpConcat;
import at.petrak.hexcasting.common.casting.operators.lists.OpIndex;

12
src/main/java/at/petrak/hexcasting/common/casting/operators/OpForEach.kt
View file

@ -1,12 +0,0 @@
package at.petrak.hexcasting.common.casting.operators
import at.petrak.hexcasting.api.OperationResult
import at.petrak.hexcasting.api.Operator
import at.petrak.hexcasting.api.SpellDatum
import at.petrak.hexcasting.common.casting.CastingContext
object OpForEach : Operator {
override fun operate(stack: MutableList<SpellDatum<*>>, ctx: CastingContext): OperationResult {
return OperationResult(stack, listOf())
}
}

11
src/main/java/at/petrak/hexcasting/common/casting/operators/OpEval.kt → src/main/java/at/petrak/hexcasting/common/casting/operators/eval/OpEval.kt
View file

@ -1,4 +1,4 @@
package at.petrak.hexcasting.common.casting.operators
package at.petrak.hexcasting.common.casting.operators.eval
import at.petrak.hexcasting.api.OperationResult
import at.petrak.hexcasting.api.Operator
@ -18,14 +18,17 @@ object OpEval : Operator {
harness.stack.addAll(stack)
val sideEffects = mutableListOf<OperatorSideEffect>()
/*
for (pat in instrs) {
val res = harness.getUpdate(pat.tryGet(), ctx.world)
sideEffects.addAll(res.sideEffects)
if (res.sideEffects.any { it is OperatorSideEffect.Mishap }) {
break
}
harness.applyFunctionalData(res.newData)
}
stack.addAll(harness.stack)
*/
return OperationResult(harness.stack, sideEffects)
}
}

2
src/main/java/at/petrak/hexcasting/common/casting/operators/OpEvalDelay.kt → src/main/java/at/petrak/hexcasting/common/casting/operators/eval/OpEvalDelay.kt
View file

@ -1,4 +1,4 @@
package at.petrak.hexcasting.common.casting.operators
package at.petrak.hexcasting.common.casting.operators.eval
import at.petrak.hexcasting.api.OperationResult
import at.petrak.hexcasting.api.Operator

39
src/main/java/at/petrak/hexcasting/common/casting/operators/eval/OpForEach.kt Normal file
View file

@ -0,0 +1,39 @@
package at.petrak.hexcasting.common.casting.operators.eval
import at.petrak.hexcasting.api.OperationResult
import at.petrak.hexcasting.api.Operator
import at.petrak.hexcasting.api.Operator.Companion.getChecked
import at.petrak.hexcasting.api.SpellDatum
import at.petrak.hexcasting.common.casting.CastingContext
import at.petrak.hexcasting.common.casting.CastingHarness
import at.petrak.hexcasting.common.casting.OperatorSideEffect
object OpForEach : Operator {
override fun operate(stack: MutableList<SpellDatum<*>>, ctx: CastingContext): OperationResult {
val instrs: List<SpellDatum<*>> = stack.getChecked(stack.lastIndex - 1)
val datums: List<SpellDatum<*>> = stack.getChecked(stack.lastIndex)
stack.removeLastOrNull()
stack.removeLastOrNull()
val out = mutableListOf<SpellDatum<*>>()
val sideEffects = mutableListOf<OperatorSideEffect>()
for (subdatum in datums) {
ctx.incDepth()
val harness = CastingHarness(ctx)
harness.stack.addAll(stack)
for (pat in instrs) {
val res = harness.getUpdate(pat.tryGet(), ctx.world)
sideEffects.addAll(res.sideEffects)
if (res.sideEffects.any { it is OperatorSideEffect.Mishap }) {
break
}
harness.applyFunctionalData(res.newData)
}
out.addAll(harness.stack)
}
stack.add(SpellDatum.make(out))
return OperationResult(stack, sideEffects)
}
}