mirror of
https://github.com/AxioDL/metaforce.git
synced 2025-12-14 07:26:09 +00:00
Very, very incomplete integration of hsh/boo2
This commit is contained in:
@@ -6,12 +6,12 @@
|
||||
namespace DataSpec::DNAMP1 {
|
||||
struct Actor : IScriptObject {
|
||||
AT_DECL_DNA_YAMLV
|
||||
String<-1> name SO_NAME_SPECPROP();
|
||||
Value<atVec3f> location SO_LOCATION_SPECPROP();
|
||||
Value<atVec3f> orientation SO_ORIENTATION_SPECPROP();
|
||||
Value<atVec3f> scale SO_SCALE_SPECPROP();
|
||||
Value<atVec3f> collisionExtent SO_COLLISION_EXTENT_SPECPROP();
|
||||
Value<atVec3f> collisionOffset SO_COLLISION_OFFSET_SPECPROP();
|
||||
String<-1> name;
|
||||
Value<atVec3f> location;
|
||||
Value<atVec3f> orientation;
|
||||
Value<atVec3f> scale;
|
||||
Value<atVec3f> collisionExtent;
|
||||
Value<atVec3f> collisionOffset;
|
||||
Value<float> mass;
|
||||
Value<float> zMomentum;
|
||||
HealthInfo healthInfo;
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
#include "../DNAMP1.hpp"
|
||||
#include "../SAVW.hpp"
|
||||
#include "zeus/CAABox.hpp"
|
||||
#include "specter/genie.hpp"
|
||||
|
||||
#include <cstdio>
|
||||
|
||||
|
||||
@@ -1,9 +1,8 @@
|
||||
#pragma once
|
||||
|
||||
#include "../../DNACommon/DNACommon.hpp"
|
||||
#include "../DNAMP1.hpp"
|
||||
#include "../SAVW.hpp"
|
||||
#include "specter/genie.hpp"
|
||||
#include "DataSpec/DNACommon/DNACommon.hpp"
|
||||
#include "DataSpec/DNAMP1/DNAMP1.hpp"
|
||||
#include "DataSpec/DNAMP1/SAVW.hpp"
|
||||
|
||||
namespace DataSpec::DNAMP1 {
|
||||
|
||||
@@ -49,7 +48,7 @@ enum class EPickupType : atUint32 {
|
||||
World = 38,
|
||||
Spirit = 39,
|
||||
Newborn = 40
|
||||
} SPECTER_ENUM("Pickup Type", "", EPickupType);
|
||||
};
|
||||
|
||||
enum class ESpecialFunctionType : atUint32 {
|
||||
What,
|
||||
@@ -85,7 +84,7 @@ enum class ESpecialFunctionType : atUint32 {
|
||||
Ending,
|
||||
FusionRelay,
|
||||
WeaponSwitch // PAL Only
|
||||
} SPECTER_ENUM("Special Function", "", ESpecialFunctionType);
|
||||
};
|
||||
|
||||
struct AnimationParameters : BigDNA {
|
||||
AT_DECL_DNA_YAML
|
||||
@@ -211,9 +210,9 @@ struct GrappleParameters : BigDNA {
|
||||
struct HealthInfo : BigDNA {
|
||||
AT_DECL_DNA_YAML
|
||||
Value<atUint32> propertyCount;
|
||||
Value<float> health SPECTER_PROPERTY("Health", "Base health for object");
|
||||
Value<float> knockbackResistance SPECTER_PROPERTY("Knockback Resistance", "");
|
||||
} SPECTER_PROPERTY("Health Info", "");
|
||||
Value<float> health;
|
||||
Value<float> knockbackResistance;
|
||||
};
|
||||
|
||||
struct LightParameters : BigDNA {
|
||||
AT_DECL_DNA_YAML
|
||||
|
||||
Reference in New Issue
Block a user