update

tyanmahou · Dec 16, 2024 · 4d49770 · 4d49770
1 parent 600749f
commit 4d49770
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 46 deletions.
diff --git a/Re-Abyss/app/components/Actor/Enemy/BazookaKun/Builder.cpp b/Re-Abyss/app/components/Actor/Enemy/BazookaKun/Builder.cpp
@@ -1,4 +1,4 @@
-#include <abyss/components/Actor/Enemy/BazookaKun/Builder.hpp>
+#include <abyss/components/Actor/Enemy/BazookaKun/Builder.hpp>
 
 #include <abyss/components/Actor/Common/Body.hpp>
 #include <abyss/components/Actor/Common/ColorCtrl.hpp>

diff --git a/Re-Abyss/app/datastores/Actor/Enemy/parser/TmxEnemyParser.cpp b/Re-Abyss/app/datastores/Actor/Enemy/parser/TmxEnemyParser.cpp
@@ -67,7 +67,8 @@ namespace
                 Vec2 size = obj.toRectF().size;
                 RectF rect{ obj.pos + Vec2{0, -size.y}, size};
                 it->pos = rect.center().rotatedAt(rect.bl(), s3d::ToRadians(obj.rotation));
-                it->footPos = rect.bottomCenter().rotatedAt(rect.bl(), s3d::ToRadians(obj.rotation));
+                Vec2 footBase = it->isFlipped ? rect.topCenter() : rect.bottomCenter();
+                it->footPos = footBase.rotatedAt(rect.bl(), s3d::ToRadians(obj.rotation));
                 it->isFixBazooka = obj.getProperty(U"fix_bazooka").value_or(false);
                 it->bazookaRotate = obj.getProperty(U"bazooka_rotate").value_or(0.0);
                 return it;

diff --git a/Re-Abyss/build/tests/data/maps/Enemy/BazookaKun.tmx b/Re-Abyss/build/tests/data/maps/Enemy/BazookaKun.tmx
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.0" orientation="orthogonal" renderorder="right-down" width="100" height="100" tilewidth="40" tileheight="40" infinite="1" backgroundcolor="#7d80bc" nextlayerid="12" nextobjectid="30">
+<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="100" height="100" tilewidth="40" tileheight="40" infinite="1" backgroundcolor="#7d80bc" nextlayerid="12" nextobjectid="32">
  <editorsettings>
   <chunksize width="28" height="16"/>
  </editorsettings>
  <tileset firstgid="1" source="../../../../resources/maps/Tileset/TileStage0.tsx"/>
  <tileset firstgid="46" source="../../../../resources/maps/Tileset/Gimmick.tsx"/>
- <tileset firstgid="56" source="../../../../resources/maps/Tileset/Enemy.tsx"/>
+ <tileset firstgid="57" source="../../../../resources/maps/Tileset/Enemy.tsx"/>
  <group id="6" name="bgs" locked="1"/>
  <group id="3" name="decor" locked="1">
   <objectgroup id="7" name="back">
@@ -15,18 +15,18 @@
   </objectgroup>
  </group>
  <objectgroup id="10" name="room">
-  <object id="1" class="Room" x="0" y="0" width="1120" height="640">
+  <object id="1" type="Room" x="0" y="0" width="1120" height="640">
    <properties>
     <property name="left" type="bool" value="true"/>
     <property name="right" type="bool" value="true"/>
    </properties>
   </object>
-  <object id="7" class="Room" x="1120" y="0" width="1120" height="640">
+  <object id="7" type="Room" x="1120" y="0" width="1120" height="640">
    <properties>
     <property name="left" type="bool" value="true"/>
    </properties>
   </object>
-  <object id="27" class="Room" x="-1120" y="0" width="1120" height="640">
+  <object id="27" type="Room" x="-1120" y="0" width="1120" height="640">
    <properties>
     <property name="left" type="bool" value="false"/>
     <property name="right" type="bool" value="true"/>
@@ -36,39 +36,39 @@
  <layer id="2" name="land" width="100" height="100" locked="1">
   <data encoding="csv">
    <chunk x="-56" y="0" width="28" height="16">
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,5,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10
 </chunk>
    <chunk x="-28" y="0" width="28" height="16">
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,30,30,30,30,30,30,30,30,30,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
+7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,30,30,30,30,30,30,30,30,30,
+7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+10,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10
 </chunk>
    <chunk x="0" y="0" width="28" height="16">
@@ -111,24 +111,26 @@
  </layer>
  <objectgroup id="9" name="item" locked="1"/>
  <objectgroup id="4" name="enemy" locked="1">
-  <object id="20" gid="67" x="680" y="560" width="90" height="60"/>
-  <object id="21" gid="67" x="1640" y="560" width="90" height="60"/>
-  <object id="22" gid="67" x="1760" y="480" width="90" height="60"/>
-  <object id="23" gid="1073741891" x="1760" y="140" width="90" height="60"/>
-  <object id="24" gid="67" x="2160" y="120" width="90" height="60" rotation="270"/>
-  <object id="25" gid="2147483715" x="2160" y="480" width="90" height="60" rotation="270"/>
-  <object id="26" gid="2147483715" x="1920" y="560" width="90" height="60"/>
-  <object id="28" gid="2147483715" x="-1000" y="560" width="90" height="60">
+  <object id="20" gid="68" x="680" y="560" width="90" height="60"/>
+  <object id="21" gid="68" x="1640" y="560" width="90" height="60"/>
+  <object id="22" gid="68" x="1760" y="480" width="90" height="60"/>
+  <object id="23" gid="1073741892" x="1760" y="140" width="90" height="60"/>
+  <object id="24" gid="68" x="2160" y="120" width="90" height="60" rotation="270"/>
+  <object id="25" gid="2147483716" x="2160" y="480" width="90" height="60" rotation="270"/>
+  <object id="26" gid="2147483716" x="1920" y="560" width="90" height="60"/>
+  <object id="28" gid="2147483716" x="-1000" y="560" width="90" height="60">
    <properties>
     <property name="bazooka_rotate" type="float" value="-45"/>
     <property name="fix_bazooka" type="bool" value="true"/>
    </properties>
   </object>
-  <object id="29" gid="2147483715" x="-720" y="560" width="90" height="60">
+  <object id="29" gid="2147483716" x="-720" y="560" width="90" height="60">
    <properties>
     <property name="fix_bazooka" type="bool" value="true"/>
    </properties>
   </object>
+  <object id="30" gid="68" x="-1080" y="360" width="90" height="60" rotation="90"/>
+  <object id="31" gid="2147483716" x="-1080" y="80" width="90" height="60" rotation="90"/>
  </objectgroup>
  <objectgroup id="8" name="gimmick" locked="1">
   <object id="2" gid="48" x="160" y="560" width="40" height="80"/>