Differential D5264

[Gameplay] Double temple of Amun capture points
ClosedPublic
Actions

Authored by real_tabasco_sauce on Sun, May 5, 7:32 AM.

Details

Reviewers

wowgetoffyourcellphone

Group Reviewers

Balancing

Commits

rP28081: [Gameplay] Increase capture points for Temple of Amun

Summary

The temple of amun is a special structure that trains champions and features 2x health, but has the same capture points as any other temple.
This can make it really hard to hold onto especially since it is so large. Increasing its capture points seems fitting.

Test Plan

agree

Diff Detail

Repository

rP 0 A.D. Public Repository

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

real_tabasco_sauce created this revision.Sun, May 5, 7:32 AM

Herald added a reviewer: Balancing. · View Herald TranscriptSun, May 5, 7:32 AM

Build failure - The Moirai have given mortals hearts that can endure.

Debug:
    10>e:\jenkins\workspace\vs2015-differential\source\network\fsm.cpp(23): error C2084: function 'CFsmEvent::CFsmEvent(unsigned int,void *)' already has a body [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\network.vcxproj]
    10>e:\jenkins\workspace\vs2015-differential\source\network\fsm.cpp(29): error C2600: 'CFsmEvent::~CFsmEvent': cannot define a compiler-generated special member function (must be declared in the class first) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\network.vcxproj]
    10>e:\jenkins\workspace\vs2015-differential\source\network\fsm.cpp(33): error C2955: 'CFsm': use of class template requires template argument list [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\network.vcxproj]
    10>e:\jenkins\workspace\vs2015-differential\source\network\fsm.cpp(35): error C2509: 'AddTransition': member function not declared in 'CFsm' [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\network.vcxproj]
    10>e:\jenkins\workspace\vs2015-differential\source\network\fsm.cpp(39): error C2955: 'CFsm': use of class template requires template argument list [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\network.vcxproj]
    10>e:\jenkins\workspace\vs2015-differential\source\network\fsm.cpp(40): error C2509: 'SetFirstState': member function not declared in 'CFsm' [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\network.vcxproj]
    10>e:\jenkins\workspace\vs2015-differential\source\network\fsm.cpp(44): error C2955: 'CFsm': use of class template requires template argument list [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\network.vcxproj]
    10>e:\jenkins\workspace\vs2015-differential\source\network\fsm.cpp(45): error C2509: 'SetCurrState': member function not declared in 'CFsm' [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\network.vcxproj]
    10>e:\jenkins\workspace\vs2015-differential\source\network\fsm.cpp(49): error C2955: 'CFsm': use of class template requires template argument list [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\network.vcxproj]
    10>e:\jenkins\workspace\vs2015-differential\source\network\fsm.cpp(50): error C2509: 'IsFirstTime': member function not declared in 'CFsm' [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\network.vcxproj]
    10>e:\jenkins\workspace\vs2015-differential\source\network\fsm.cpp(54): error C2955: 'CFsm': use of class template requires template argument list [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\network.vcxproj]
    10>e:\jenkins\workspace\vs2015-differential\source\network\fsm.cpp(55): error C2509: 'Update': member function not declared in 'CFsm' [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\network.vcxproj]
    10>e:\jenkins\workspace\vs2015-differential\source\network\fsm.cpp(81): error C2955: 'CFsm': use of class template requires template argument list [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\network.vcxproj]
    10>e:\jenkins\workspace\vs2015-differential\source\network\fsm.cpp(82): error C2509: 'IsDone': member function not declared in 'CFsm' [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\network.vcxproj]

Link to build: https://jenkins.wildfiregames.com/job/vs2015-differential/8804/display/redirect

Build failure - The Moirai have given mortals hearts that can endure.

builderr-debug-macos.txt
../../../source/network/FSM.cpp:22:12: error: redefinition of 'CFsmEvent'
CFsmEvent::CFsmEvent(unsigned int type, void* pParam)
           ^
../../../source/network/FSM.h:35:2: note: previous definition is here
        CFsmEvent(unsigned int type, void* pParam) :
        ^
../../../source/network/FSM.cpp:28:12: error: definition of implicitly declared destructor
CFsmEvent::~CFsmEvent()
           ^
../../../source/network/FSM.cpp:33:6: error: 'CFsm' is not a class, namespace, or enumeration
void CFsm::AddTransition(unsigned int state, unsigned int eventType, unsigned int nextState,
     ^
../../../source/network/FSM.h:67:7: note: 'CFsm' declared here
class CFsm
      ^
../../../source/network/FSM.cpp:34:2: error: unknown type name 'Action'
        Action* pAction /* = nullptr */, void* pContext /* = nullptr*/)
        ^
../../../source/network/FSM.cpp:39:6: error: 'CFsm' is not a class, namespace, or enumeration
void CFsm::SetFirstState(unsigned int firstState)
     ^
../../../source/network/FSM.h:67:7: note: 'CFsm' declared here
class CFsm
      ^
../../../source/network/FSM.cpp:44:6: error: 'CFsm' is not a class, namespace, or enumeration
void CFsm::SetCurrState(unsigned int state)
     ^
../../../source/network/FSM.h:67:7: note: 'CFsm' declared here
class CFsm
      ^
../../../source/network/FSM.cpp:49:6: error: 'CFsm' is not a class, namespace, or enumeration
bool CFsm::IsFirstTime() const
     ^
../../../source/network/FSM.h:67:7: note: 'CFsm' declared here
class CFsm
      ^
../../../source/network/FSM.cpp:54:6: error: 'CFsm' is not a class, namespace, or enumeration
bool CFsm::Update(unsigned int eventType, void* pEventParam)
     ^
../../../source/network/FSM.h:67:7: note: 'CFsm' declared here
class CFsm
      ^
../../../source/network/FSM.cpp:81:6: error: 'CFsm' is not a class, namespace, or enumeration
bool CFsm::IsDone() const
     ^
../../../source/network/FSM.h:67:7: note: 'CFsm' declared here
class CFsm
      ^
9 errors generated.
make[1]: *** [obj/network_Debug/FSM.o] Error 1
make: *** [network] Error 2

Link to build: https://jenkins.wildfiregames.com/job/macos-differential/7724/display/redirect

Harbormaster completed remote builds in B22917: Diff 22922.Sun, May 5, 7:42 AM

real_tabasco_sauce requested review of this revision.Sun, May 5, 7:42 AM

Don’t care—seems fine. I would make it a touch less than double. Not huge either way, though.

wowgetoffyourcellphone accepted this revision.Tue, May 7, 2:50 AM

This revision is now accepted and ready to land.Tue, May 7, 2:50 AM

This revision was landed with ongoing or failed builds.Thu, May 9, 8:12 PM

Closed by commit rP28081: [Gameplay] Increase capture points for Temple of Amun (authored by wowgetoffyourcellphone). · Explain Why

This revision was automatically updated to reflect the committed changes.

wowgetoffyourcellphone added a commit: rP28081: [Gameplay] Increase capture points for Temple of Amun.

Owners added a subscriber: Restricted Owners Package.Thu, May 9, 8:12 PM