More stuff. This stuff seems to not be great now.

cheezballs · Dec 12, 2023 · bcba1c3 · bcba1c3
1 parent fae83c6
commit bcba1c3
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 14 deletions.
diff --git a/src/main/java/dev/indoors/ringrats/simulation/action/GrappleMove.java b/src/main/java/dev/indoors/ringrats/simulation/action/GrappleMove.java
@@ -0,0 +1,4 @@
+package dev.indoors.ringrats.simulation.action;
+
+public class GrappleMove extends Action {
+}
diff --git a/src/main/java/dev/indoors/ringrats/simulation/attribute/AttributeModifier.java b/src/main/java/dev/indoors/ringrats/simulation/attribute/AttributeModifier.java
@@ -23,20 +23,19 @@ public Integer performModification(Integer originalValue) {
 	}
 
 	private Integer performDivision(Integer originalValue) {
-		// TODO: logic here and below
-		return originalValue;
+		return originalValue / valueToModifyBy;
 	}
 
 	private Integer performSubtraction(Integer originalValue) {
-		return originalValue;
+		return originalValue - valueToModifyBy;
 	}
 
 	private Integer performMultiplication(Integer originalValue) {
-		return originalValue;
+		return originalValue * valueToModifyBy;
 	}
 
 	private Integer performAddition(Integer originalValue) {
-		return originalValue;
+		return originalValue + valueToModifyBy;
 	}
 
 }
diff --git a/src/main/java/dev/indoors/ringrats/simulation/match/Match.java b/src/main/java/dev/indoors/ringrats/simulation/match/Match.java
@@ -1,7 +1,9 @@
 package dev.indoors.ringrats.simulation.match;
 
+import dev.indoors.ringrats.simulation.action.Action;
 import dev.indoors.ringrats.simulation.condition.Condition;
 import dev.indoors.ringrats.simulation.core.comparator.InitiativeComparator;
+import dev.indoors.ringrats.simulation.position.Position;
 import dev.indoors.ringrats.simulation.stipulation.Stipulation;
 import dev.indoors.ringrats.simulation.task.FocusAttentionTask;
 import dev.indoors.ringrats.simulation.wrestler.Performer;
@@ -34,6 +36,17 @@ public void simulateTurn() {
 		// ordered based on current initiative calculation
 		Collection<Wrestler> orderedWrestlers = wrestlers.stream().sorted(new InitiativeComparator()).toList();
 		for (Wrestler wrestler : orderedWrestlers) {
+			Position currentPosition = wrestler.getPosition();
+
+			Set<Action> stipulationActions = new HashSet<>();
+			for (Stipulation stipulation : stipulations) {
+				stipulationActions.addAll(stipulation.getActionMap().get(currentPosition));
+			}
+
+
+			// get list of weighted actions
+			// pick a random action
+			// perform action
 
 		}
 	}

diff --git a/src/main/java/dev/indoors/ringrats/simulation/position/InRingPosition.java b/src/main/java/dev/indoors/ringrats/simulation/position/InRingPosition.java
@@ -1,6 +1,5 @@
 package dev.indoors.ringrats.simulation.position;
 
-import dev.indoors.ringrats.simulation.action.Action;
 import dev.indoors.ringrats.simulation.attribute.AttributeModifier;
 
 import java.util.Collection;
@@ -10,9 +9,4 @@ public class InRingPosition extends Position {
 	public Collection<AttributeModifier> getAttributeModifiers() {
 		return null;
 	}
-
-	@Override
-	public Collection<Action> getAvailableActions() {
-		return null;
-	}
 }
diff --git a/src/main/java/dev/indoors/ringrats/simulation/position/Position.java b/src/main/java/dev/indoors/ringrats/simulation/position/Position.java
@@ -1,6 +1,5 @@
 package dev.indoors.ringrats.simulation.position;
 
-import dev.indoors.ringrats.simulation.action.Action;
 import dev.indoors.ringrats.simulation.attribute.AttributeModifier;
 import lombok.Getter;
 import lombok.Setter;
@@ -13,6 +12,4 @@ public abstract class Position {
 
 	public abstract Collection<AttributeModifier> getAttributeModifiers();
 
-	public abstract Collection<Action> getAvailableActions();
-
 }
diff --git a/src/main/java/dev/indoors/ringrats/simulation/stipulation/OneFallStipulation.java b/src/main/java/dev/indoors/ringrats/simulation/stipulation/OneFallStipulation.java
@@ -1,13 +1,19 @@
 package dev.indoors.ringrats.simulation.stipulation;
 
+import dev.indoors.ringrats.simulation.action.Action;
+import dev.indoors.ringrats.simulation.action.GrappleMove;
 import dev.indoors.ringrats.simulation.condition.Condition;
 import dev.indoors.ringrats.simulation.condition.StandingCondition;
+import dev.indoors.ringrats.simulation.position.InRingPosition;
+import dev.indoors.ringrats.simulation.position.Position;
 import dev.indoors.ringrats.simulation.wrestler.Wrestler;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
 
 @Getter
@@ -24,4 +30,13 @@ public Set<Condition> getStartingConditions() {
 		conditions.add(new StandingCondition());
 		return conditions;
 	}
+
+	@Override
+	public HashMap<Position, Set<Action>> getActionMap() {
+		return new HashMap<>(Map.of(new InRingPosition(), getInRingActions()));
+	}
+
+	private Set<Action> getInRingActions() {
+		return Set.of(new GrappleMove());
+	}
 }
diff --git a/src/main/java/dev/indoors/ringrats/simulation/stipulation/Stipulation.java b/src/main/java/dev/indoors/ringrats/simulation/stipulation/Stipulation.java
@@ -1,7 +1,10 @@
 package dev.indoors.ringrats.simulation.stipulation;
 
+import dev.indoors.ringrats.simulation.action.Action;
 import dev.indoors.ringrats.simulation.condition.Condition;
+import dev.indoors.ringrats.simulation.position.Position;
 
+import java.util.HashMap;
 import java.util.Set;
 
 public abstract class Stipulation {
@@ -10,4 +13,6 @@ public abstract class Stipulation {
 
 	public abstract String getName();
 
+	public abstract HashMap<Position, Set<Action>> getActionMap();
+
 }
diff --git a/src/main/java/dev/indoors/ringrats/simulation/wrestler/Performer.java b/src/main/java/dev/indoors/ringrats/simulation/wrestler/Performer.java
@@ -1,5 +1,6 @@
 package dev.indoors.ringrats.simulation.wrestler;
 
+import dev.indoors.ringrats.simulation.action.Action;
 import dev.indoors.ringrats.simulation.condition.Condition;
 import dev.indoors.ringrats.simulation.core.Simulatable;
 import dev.indoors.ringrats.simulation.position.InRingPosition;
@@ -9,6 +10,7 @@
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.Stack;
@@ -25,6 +27,7 @@ public abstract class Performer implements Simulatable {
 	Set<Condition> conditions = new HashSet<>();
 	Set<Condition> startingConditions = new HashSet<>();
 	Position position;
+	HashMap<Position, Set<Action>> uniqueActions;
 
 	public void addTask(Task task) {
 		tasks.push(task);