From 25c9abd427a2859fc9b6890b22476b4720cae964 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Przemys=C5=82aw=20Pluta?=
 <noreply.git@mx.bartlomiejpluta.com>
Date: Thu, 1 Sep 2022 11:38:17 +0200
Subject: [PATCH] Use BASE API utility MapObject class

---
 data.mv.db                                    | Bin 36864 -> 45056 bytes
 .../demo/entity/MapObject.java                | 131 ++----------------
 2 files changed, 15 insertions(+), 116 deletions(-)

diff --git a/data.mv.db b/data.mv.db
index fc1d0abcc25961b60d93d0056edddf6507e64396..e8e9d83da370d6bbf8541fdb192ba1848c08a542 100644
GIT binary patch
literal 45056
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

delta 4370
zcmZp8z|^pSX@U}SqJ_~!U3IZU3nQJhoYa!!jMO44lQct%R1-5Ju8oEL{1Y4aCkYU#
zPJulx(ZWC{DJMTU+sa5MCpFK?P$xIBz{)t$QYSaD!ph9pKqoJ?qQuHrrywyswb;r?
zrzk(a#40t>00N8+OpJ9(GILX{Oe`#tObm>Yb;?qUiZk=`tc(*a3?|1VL{B~tz-nWa
zz`)4Jz_);bfx%)L1K<1x29DJt;<~K4i3NIQ3=Aw;b{q`i3|z?>rFq$U#);;s2xi*k
ziMCx@i5Bc2wZ@5-U_B;a(sULhScerz2h<y8lMfWCg+twMl#*lsb-AG_)ajOK79h8q
zo0_9J-CU<Mue3Nd#jzv|?gjHyB>$MFP7X*CVNNtpn;a0N#gu3{Ss_8($1*J$WS#*=
zP$WXlLj(;L^V5*cPuqMy$ef8e(J*!L#Zr0ZM8mYn^TQ-2F9<2a5c{vXooPGc<d2GS
zT)vJ0@%~O;uFfHo4{9e&wo%{8=so#?s^(;A4M7Qnq>_e`r;C!NAd8NIDsR<f2MsY~
zo$HO%HaBT}Vl#vVC{nsWj!{IaOEoY^G%_<zoxIUMEHcqN6&n7=;ACWsl8i`<284a)
zsgvUp5+)x|U}dt>o_t(kB6GQB%;sptXjU3{-iez@bI#;r#yU)zmnMHP4q?*cpX_BK
z&!lHEIorfiPVZbdD<gv-Q$TrseoAUyd}2{iez_q72wc@mo_xsUGL!z1$<s|$nRLB2
z?=yYJ#H6%!@;ZxJCS}XXx|T&u%7v2`S}tQ!V43V`Wz3|QvAND_0wa^!fyn|k%b3(Q
zPTpaY&!k>IS<_a>U7ZP>Tjn<~u*bu5iv&Eku<9x4F-Rcg7E45KNk%YJ@MN52h>T+i
zi@3=L5|z^NWt>zKP(nw|IEj`9#;}Y7OXx5@N=8aSPUx1PjKrO2o(#3yeDa3*N{9>v
zvc>>4LnT@on3y1CC=lNa%15yWxd1Xxo;-2B2zR1+3e+A8kUcq2Kf(()OK1@RE8Hy8
zz#heP0L((-J(_|&N5?N_Wh~$P$8j!GeWC@kaiS$}DzsQKH8(Ugg7eIbQVc8*JTuGW
zL^u!RJOs}q&Da2;&(tv4#00L=)F{co0KqdhGDwE=>P^keO%NK*5)BOzO3e*SEf7|i
z8>Lww9Aj>hl#I}4U}|cb3OCdwE!Dyd&NDSML2{azNpdp66tj9u<75*912ZHF<Z=rG
za1=mY4&y;w4&y-_4&^}|4&^}|4&y-_4&y-_4&~KDT@K|!T@K|zT@K|zT@K@cU2Mdg
zY6dC)p+OGgL4q8{gE$<<gE$<*t2cnU9Ktn#x*W!XxE#iVxE#uZIvmP_IvmP_IvmP_
zIvmCWIUH1Kf$_$wZS0d2*fo(0aOCnAQQjw6q?jg}8&56_2$&SWE}3Ya2F+Av;1VC+
zZ~#?`>Ub(eB-7I-$0ek@Tg``*b_bB#21uoytbGHn(k=y2+NF|K+9eM_X$LEXj6kIj
zw6x2nW?`dKkeTP4Uz%59Wq_q+lt#;z5%zM9R;?5RSStl75hAB6M5;|rGBiyxH;1QM
z3qxqCHOG=_6CtGzsANTH)f$^3RbCc`kW`xpPPGdhaHLu#dq<R1i`=4xr&<dGJgF8-
z6dKbq3ZZo}EL$fcrBbRkav^mxqJ0Un#{<1iCZWRtX;nk(<jEWDL<B&c8boriFu<BP
zx#PWEBjb&Xlob5^CM#;oP1aTGq(Q3^xk-&kdq}P`L?qT!L*rB<a}yI#lR6I6#e?+B
zEKrjwYR?S4@sel&?%rUgVRPg(Yy|6>1z9CQ(s2WFI+jGVH80z5W{^Z`YvM@9h$L+|
z$dWX;zZP9Yll~h0lQJZeB1$n(=7ClvK6r{Rlsp1&up>8|Eew&<hauK1!^}(DE~gQ+
YY_>pl3erGFs*$OYk%fub<c<FR04LNRod5s;

diff --git a/src/main/java/com/bartlomiejpluta/demo/entity/MapObject.java b/src/main/java/com/bartlomiejpluta/demo/entity/MapObject.java
index c82ce32..3f51bd3 100644
--- a/src/main/java/com/bartlomiejpluta/demo/entity/MapObject.java
+++ b/src/main/java/com/bartlomiejpluta/demo/entity/MapObject.java
@@ -1,141 +1,40 @@
 package com.bartlomiejpluta.demo.entity;
 
+import com.bartlomiejpluta.base.api.context.Context;
 import com.bartlomiejpluta.base.api.context.ContextHolder;
-import com.bartlomiejpluta.base.api.move.Direction;
-import com.bartlomiejpluta.base.util.path.CharacterPath;
-import com.bartlomiejpluta.base.util.path.PathExecutor;
+import com.bartlomiejpluta.demo.runner.DemoRunner;
 import lombok.Getter;
 import lombok.NonNull;
 
 import java.util.concurrent.CompletableFuture;
-import java.util.function.Supplier;
 
-import static java.util.Objects.requireNonNull;
 import static java.util.concurrent.CompletableFuture.completedFuture;
 
-public abstract class MapObject extends NamedCharacter {
-   private static final float INTERVAL = 0.05f;
-   private static final float COOLDOWN = 0.5f;
-   protected final PathExecutor<MapObject> pathExecutor = new PathExecutor<>(this);
-   private final String interactSound;
-
-   protected boolean interacting = false;
-
-   private Supplier<CompletableFuture<?>> beforeAll;
-   private Supplier<CompletableFuture<?>> before;
-   private Supplier<CompletableFuture<?>> after;
-   private Supplier<CompletableFuture<?>> afterAll;
-
-   private CompletableFuture<?> future;
+public abstract class MapObject extends com.bartlomiejpluta.base.util.world.MapObject {
+   protected final Context context;
+   protected final DemoRunner runner;
    @Getter
    private final String name;
-
+   private final String interactSound;
 
    public MapObject(@NonNull String id) {
-      this(DB.dao.map_object.find(id));
+      this(DB.dao.object.find(id));
    }
 
-   public MapObject(@NonNull DB.model.MapObjectModel template) {
-      super(ContextHolder.INSTANCE.getContext().createCharacter(A.charsets.get(template.getCharset()).uid));
-      short frame = requireNonNull(template.getFrame());
+   public MapObject(@NonNull DB.model.ObjectModel template) {
+      super(ContextHolder.INSTANCE.getContext().createCharacter(A.charsets.get(template.getCharset()).uid), template.getFrame());
+      this.context = ContextHolder.INSTANCE.getContext();
+      this.runner = DemoRunner.instance();
       this.name = template.getName();
       this.interactSound = A.sounds.get(template.getInteractSound()).uid;
-
-      setBlocking(true);
-      disableAnimation();
-
-      setAnimationFrame(frame);
-      pathExecutor.setRepeat(1);
-
-      pathExecutor.setPath(new CharacterPath<MapObject>()
-              .run(this::startInteraction)
-              .turn(Direction.LEFT, frame)
-              .wait(INTERVAL)
-              .turn(Direction.RIGHT, frame)
-              .wait(INTERVAL)
-              .turn(Direction.UP, frame)
-              .wait(INTERVAL)
-              .run(this::runInteraction)
-              .suspend(() -> future)
-              .wait(INTERVAL)
-              .turn(Direction.RIGHT, frame)
-              .wait(INTERVAL)
-              .turn(Direction.LEFT, frame)
-              .wait(INTERVAL)
-              .turn(Direction.DOWN, frame)
-              .run(this::finishInteraction)
-              .suspend(() -> future)
-              .wait(COOLDOWN)
-              .run(this::completeInteraction)
-      );
-   }
-
-   public MapObject beforeAll(@NonNull Supplier<CompletableFuture<?>> action) {
-      this.beforeAll = action;
-      return this;
-   }
-
-   public MapObject before(@NonNull Supplier<CompletableFuture<?>> action) {
-      this.before = action;
-      return this;
-   }
-
-   public MapObject after(@NonNull Supplier<CompletableFuture<?>> action) {
-      this.after = action;
-      return this;
-   }
-
-   public MapObject afterAll(@NonNull Supplier<CompletableFuture<?>> action) {
-      this.afterAll = action;
-      return this;
-   }
-
-   public void triggerInteraction() {
-      if (interacting) {
-         return;
-      }
-
-      pathExecutor.reset();
-
-      if (beforeAll != null) {
-         beforeAll.get().thenRun(() -> interacting = true);
-      } else {
-         interacting = true;
-      }
-   }
-
-   private void runInteraction() {
-      this.future = (before != null ? before.get() : completedFuture(null))
-              .thenCompose(v -> interact())
-              .thenCompose(v -> (after != null ? after.get() : completedFuture(null)));
-   }
-
-   private void startInteraction() {
-      if (interactSound != null) {
-         context.playSound(interactSound);
-      }
-   }
-
-   private void finishInteraction() {
-      this.future = afterAll != null ? afterAll.get() : completedFuture(null);
-   }
-
-   private void completeInteraction() {
-      interacting = false;
    }
 
    @Override
-   public void update(float dt) {
-      if (interacting) {
-         pathExecutor.execute(getLayer(), dt);
+   protected @NonNull CompletableFuture<?> onInteractionBegin() {
+      if (interactSound != null) {
+         context.playSound(interactSound);
       }
-   }
 
-   protected final void reset() {
-      setFaceDirection(Direction.DOWN);
-      pathExecutor.reset();
-      interacting = false;
+      return completedFuture(null);
    }
-
-   protected abstract CompletableFuture<?> interact();
 }
\ No newline at end of file