AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix behavior translation, still needs work

This commit is contained in:
Phillip Stephens 2019-11-13 10:44:43 -08:00
parent 8881376195
commit e059f224d4
Signed by: Antidote
GPG Key ID: F8BEE4C83DACA60D
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Runtime/MP1/World/CRidley.cpp
View File

@ -62,11 +62,11 @@ std::array<std::array<SSomeRidleyStruct2, 12>, 5> skSomeRidleyStruct{{
{5, 100.f, -1}, {5, 100.f, -1},
{1, 100.f, -1}, {1, 100.f, -1},
{1, 100.f, -1}, {1, 100.f, -1},
{1, 50.f, -1}, {1, 100.f, -1},
{1, 100.f, -1}, {1, 100.f, -1},
{-1, 100.f, -1}, {-1, 100.f, -1},
{-1, 100.f, -1}, {-1, 100.f, -1},
{-1, 50.f, -1}, {-1, 100.f, -1},
{-1, 100.f, -1}, {-1, 100.f, -1},
{-1, 100.f, -1}, {-1, 100.f, -1},
{-1, 100.f, -1}, {-1, 100.f, -1},
@ -77,7 +77,7 @@ std::array<std::array<SSomeRidleyStruct2, 12>, 5> skSomeRidleyStruct{{
{0, 100.f, -1}, {0, 100.f, -1},
{0, 50.f, 4}, {0, 50.f, 4},
{2, 100.f, -1}, {2, 100.f, -1},
{3, 50.f, 5}, {3, 50.f, 4},
{2, 100.f, -1}, {2, 100.f, -1},
{3, 50.f, 4}, {3, 50.f, 4},
{0, 100.f, -1}, {0, 100.f, -1},
@ -115,6 +115,7 @@ std::array<std::array<SSomeRidleyStruct2, 12>, 5> skSomeRidleyStruct{{
{-1, 100.f, -1}, {-1, 100.f, -1},
}}, }},
}}; }};
std::array<SSomeRidleyStruct, 5> skSomeStruct{{{4, 6, 50.f, 50.f, 0.f, 33.f, 0.f, 1, 0, 0, 0, 0}, std::array<SSomeRidleyStruct, 5> skSomeStruct{{{4, 6, 50.f, 50.f, 0.f, 33.f, 0.f, 1, 0, 0, 0, 0},
{4, 6, 20.f, 20.f, 60.f, 50.f, 0.f, 2, 0, 0, 0, 0}, {4, 6, 20.f, 20.f, 60.f, 50.f, 0.f, 2, 0, 0, 0, 0},
{4, 6, 40.f, 40.f, 20.f, 50.f, 50.f, 2, 1, 0, 0, 0}, {4, 6, 40.f, 40.f, 20.f, 50.f, 50.f, 2, 1, 0, 0, 0},
@ -1230,7 +1231,7 @@ void CRidley::Lurk(urde::CStateManager& mgr, urde::EStateMsg msg, float arg) {
SetDestPos(destPos); SetDestPos(destPos);
zeus::CVector3f vec = GetTransform().basis[1].toVec2f().normalized(); zeus::CVector3f vec = GetTransform().basis[1].toVec2f().normalized();
zeus::CTransform xf(vec.cross(zeus::skUp), vec, zeus::skUp, GetTranslation()); zeus::CTransform xf(vec.cross(zeus::skUp), vec, zeus::skUp, GetTranslation());
// SetTransform(xf); SetTransform(xf);
xa33_27_ = false; xa33_27_ = false;
xa34_26_ = false; xa34_26_ = false;
} else if (msg == EStateMsg::Update) { } else if (msg == EStateMsg::Update) {

4
Runtime/World/CStateMachine.cpp
View File

@ -78,10 +78,10 @@ void CStateMachineState::Update(CStateManager& mgr, CAi& ai, float delta) {
if (andPassed && state) { if (andPassed && state) {
x4_state->CallFunc(mgr, ai, EStateMsg::Deactivate, 0.f); x4_state->CallFunc(mgr, ai, EStateMsg::Deactivate, 0.f);
x4_state = state; x4_state = state;
#ifndef NDEBUG //#ifndef NDEBUG
fmt::print(fmt("{} {} {} - {} {}\n"), ai.GetUniqueId(), ai.GetEditorId(), ai.GetName(), fmt::print(fmt("{} {} {} - {} {}\n"), ai.GetUniqueId(), ai.GetEditorId(), ai.GetName(),
state->xc_name, int(state - x0_machine->GetStateVector().data())); state->xc_name, int(state - x0_machine->GetStateVector().data()));
#endif //#endif
x8_time = 0.f; x8_time = 0.f;
x18_24_codeTrigger = false; x18_24_codeTrigger = false;
xc_random = mgr.GetActiveRandom()->Float(); xc_random = mgr.GetActiveRandom()->Float();