Various stubs, and starting on core functionality

DataSpec/Blender/RetroMasterShader.py

@@ -166,7 +166,7 @@ def make_uva4():
     # Modulo
     mod1 = new_grp.nodes.new('ShaderNodeMath')
     mod1.operation = 'MODULO'
-    mod1.inputs[1].default_value = 1.0
+    mod1.inputs[1].default_value = 900.0
     mod1.location = (-400, 0)
     
     # Multiply3
@@ -236,7 +236,7 @@ def make_uva5():
     # Modulo
     mod1 = new_grp.nodes.new('ShaderNodeMath')
     mod1.operation = 'MODULO'
-    mod1.inputs[1].default_value = 1.0
+    mod1.inputs[1].default_value = 900.0
     mod1.location = (-400, 0)
     
     # Multiply3

DataSpec/DNACommon/CMakeLists.txt

@@ -14,5 +14,7 @@ add_library(DNACommon
             ANIM.hpp ANIM.cpp
             DeafBabe.hpp
             BabeDead.hpp
+            Tweaks/ITweakGame.hpp
+            Tweaks/ITweakParticle.hpp
             Tweaks/ITweakPlayer.hpp
             Tweaks/ITweakPlayerControl.hpp)

DataSpec/DNACommon/Tweaks/ITweakGame.hpp

@@ -0,0 +1,16 @@
+#ifndef __DNACOMMON_ITWEAKGAME_HPP__
+#define __DNACOMMON_ITWEAKGAME_HPP__
+
+#include "../DNACommon.hpp"
+
+namespace Retro
+{
+
+struct ITweakGame : BigYAML
+{
+    virtual const std::string& GetWorldPrefix() const=0;
+};
+
+}
+
+#endif

DataSpec/DNACommon/Tweaks/ITweakParticle.hpp

@@ -0,0 +1,15 @@
+#ifndef __DNACOMMON_ITWEAKPARTICLE_HPP__
+#define __DNACOMMON_ITWEAKPARTICLE_HPP__
+
+#include "../DNACommon.hpp"
+
+namespace Retro
+{
+
+struct ITweakParticle : BigYAML
+{
+};
+
+}
+
+#endif

DataSpec/DNAMP1/CMakeLists.txt

@@ -13,6 +13,7 @@ make_dnalist(liblist
              MREA
              DeafBabe
              SCAN
+             Tweaks/CTweakGame
              Tweaks/CTweakParticle
              Tweaks/CTweakPlayer
              Tweaks/CTweakPlayerControl)

DataSpec/DNAMP1/Tweaks/CTweakGame.hpp

@@ -0,0 +1,23 @@
+#ifndef _DNAMP1_CTWEAKGAME_HPP_
+#define _DNAMP1_CTWEAKGAME_HPP_
+
+#include "../../DNACommon/Tweaks/ITweakGame.hpp"
+
+namespace Retro
+{
+namespace DNAMP1
+{
+
+struct CTweakGame : ITweakGame
+{
+    DECL_YAML
+    String<-1> m_worldPrefix;
+    String<-1> m_ruinsArea; // ????
+
+    virtual const std::string& GetWorldPrefix() const { return m_worldPrefix; }
+    CTweakGame(Athena::io::IStreamReader& in) { this->read(in); }
+};
+}
+}
+
+#endif

DataSpec/DNAMP1/Tweaks/CTweakParticle.hpp

@@ -1,14 +1,14 @@
 #ifndef _DNAMP1_CTWEAKPARTICLE_HPP_
 #define _DNAMP1_CTWEAKPARTICLE_HPP_
 
-#include "../../DNACommon/DNACommon.hpp"
+#include "../../DNACommon/Tweaks/ITweakParticle.hpp"
 
 namespace Retro
 {
 namespace DNAMP1
 {
 
-struct CTweakParticle : BigYAML
+struct CTweakParticle : ITweakParticle
 {
     DECL_YAML
     String<-1> m_particle;

DataSpec/DNAMP2/CMakeLists.txt

@@ -14,4 +14,5 @@ add_library(DNAMP2
             ANCS.cpp
             CMDL.hpp
             MREA.cpp
+            MAPA.hpp
             STRG.hpp STRG.cpp)

DataSpec/DNAMP2/DNAMP2.cpp

@@ -5,6 +5,7 @@
 #include "CMDL.hpp"
 #include "ANCS.hpp"
 #include "MREA.hpp"
+#include "MAPA.hpp"
 #include "../DNACommon/TXTR.hpp"
 
 namespace Retro
@@ -222,6 +223,8 @@ ResExtractor<PAKBridge> PAKBridge::LookupExtractor(const DNAMP1::PAK::Entry& ent
         return {nullptr, MREA::Extract, {_S(".blend")}, 3};
     case SBIG('MLVL'):
         return {MLVL::Extract, nullptr, {_S(".yaml")}};
+//    case SBIG('MAPA'):
+//        return {nullptr, MAPA::Extract, {_S(".blend")}, 4};
     }
     return {};
 }

DataSpec/DNAMP2/MAPA.hpp

@@ -0,0 +1,16 @@
+#ifndef __DNAMP2_MAPA_HPP__
+#define __DNAMP2_MAPA_HPP__
+
+#include "../DNAMP1/MAPA.hpp"
+
+namespace Retro
+{
+namespace DNAMP2
+{
+struct MAPA : DNAMP1::MAPA
+{};
+
+}
+}
+
+#endif