mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-25 22:17:45 +00:00
Code Activity

remove scriptname from scripts

Browse source
This commit is contained in:
Adam 2018-01-19 20:17:49 +11:00
parent c568a998c3
commit 4b9da92b34
23 changed files with 108 additions and 115 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/native/CmnDef/CmnDefCutSceneReplay.cpp
View file

@ -3,7 +3,7 @@
class CmnDefCutSceneReplay : public EventScript
{
public:
CmnDefCutSceneReplay() : EventScript( "CmnDefCutSceneReplay", 721028 )
CmnDefCutSceneReplay() : EventScript( 721028 )
{}
void Scene00000( Entity::Player& player )

2
scripts/native/CmnDef/CmnDefInnBed.cpp
View file

@ -3,7 +3,7 @@
class CmnDefInnBed : public EventScript
{
public:
CmnDefInnBed() : EventScript( "CmnDefInnBed", 720916 )
CmnDefInnBed() : EventScript( 720916 )
{}
// menu

2
scripts/native/CmnDef/CmnDefLinkShell.cpp
View file

@ -7,7 +7,7 @@
class CmnDefLinkShell : public EventScript
{
public:
CmnDefLinkShell() : EventScript( "CmnDefLinkShell", 0xB0006 )
CmnDefLinkShell() : EventScript( 0xB0006 )
{}
void Scene00001( Entity::Player& player )

2
scripts/native/CmnDef/HouFurOrchestrion.cpp
View file

@ -3,7 +3,7 @@
class HouFurOrchestrion : public EventScript
{
public:
HouFurOrchestrion() : EventScript( "HouFurOrchestrion", 721226 )
HouFurOrchestrion() : EventScript( 721226 )
{}
void Scene00000( Entity::Player& player )

2
scripts/native/action/ActionSprint3.cpp
View file

@ -3,7 +3,7 @@
class ActionSprint3 : public ActionScript
{
public:
ActionSprint3() : ActionScript( "ActionSprint3", 3 )
ActionSprint3() : ActionScript( 3 )
{}
void onCastFinish( Core::Entity::Player& player, Core::Entity::Actor& targetActor ) override

2
scripts/native/aetheryte/Aethernet.cpp
View file

@ -12,7 +12,7 @@
class Aethernet : public EventScript
{
public:
Aethernet() : EventScript( "Aethernet", EVENTSCRIPT_AETHERNET_ID )
Aethernet() : EventScript( EVENTSCRIPT_AETHERNET_ID )
{}
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override

2
scripts/native/aetheryte/Aetheryte.cpp
View file

@ -13,7 +13,7 @@
class Aetheryte : public EventScript
{
public:
Aetheryte() : EventScript( "Aetheryte", EVENTSCRIPT_AETHERYTE_ID )
Aetheryte() : EventScript( EVENTSCRIPT_AETHERYTE_ID )
{}
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override

2
scripts/native/opening/OpeningGridania.cpp
View file

@ -65,7 +65,7 @@ private:
}
public:
OpeningGridania() : EventScript( "OpeningGridania", 1245186 )
OpeningGridania() : EventScript( 1245186 )
{}
void onEnterZone( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override

2
scripts/native/opening/OpeningLimsa.cpp
View file

@ -81,7 +81,7 @@ private:
public:
OpeningLimsa() : EventScript( "OpeningLimsa", 1245185 ) {}
OpeningLimsa() : EventScript( 1245185 ) {}
void onEnterZone( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
{

2
scripts/native/opening/OpeningUldah.cpp
View file

@ -65,7 +65,7 @@ private:
public:
OpeningUldah() : EventScript( "OpeningUldah", 1245187 ) {}
OpeningUldah() : EventScript( 1245187 ) {}
void onEnterZone( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
{

2
scripts/native/quest/ManFst001.cpp
View file

@ -90,7 +90,7 @@ private:
}
public:
ManFst001() : EventScript( "ManFst001", 65575 ) {}
ManFst001() : EventScript( 65575 ) {}
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
{

2
scripts/native/quest/ManFst002.cpp
View file

@ -189,7 +189,7 @@ private:
}
public:
ManFst002() : EventScript( "ManFst002", 65621 ) {}
ManFst002() : EventScript( 65621 ) {}
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
{

2
scripts/native/quest/ManFst003.cpp
View file

@ -12,7 +12,7 @@ private:
public:
ManFst003() : EventScript( "ManFst003", 65659 ) {}
ManFst003() : EventScript( 65659 ) {}
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
{

2
scripts/native/quest/ManFst004.cpp
View file

@ -71,7 +71,7 @@ class ManFst004 : public EventScript
static constexpr auto UnlockDesion = 14;
public:
ManFst004() : EventScript( "Close to Home", 65660 ){};
ManFst004() : EventScript( 65660 ){};
~ManFst004(){};
//////////////////////////////////////////////////////////////////////

2
scripts/native/quest/ManSea001.cpp
View file

@ -145,7 +145,7 @@ private:
}
public:
ManSea001() : EventScript( "ManSea001", 65643 ) {}
ManSea001() : EventScript( 65643 ) {}
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
{

2
scripts/native/quest/ManSea002.cpp
View file

@ -136,7 +136,7 @@ private:
player.eventPlay( getId(), 50, FADE_OUT | CONDITION_CUTSCENE | HIDE_UI, 0, 0, callback );
}
public:
ManSea002() : EventScript( "ManSea002", 65644 ) {}
ManSea002() : EventScript( 65644 ) {}
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
{

2
scripts/native/quest/ManWil001.cpp
View file

@ -129,7 +129,7 @@ private:
public:
ManWil001() : EventScript( "ManWil001", 66130 ) {}
ManWil001() : EventScript( 66130 ) {}
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
{

2
scripts/native/quest/ManWil002.cpp
View file

@ -144,7 +144,7 @@ private:
public:
ManWil002() : EventScript( "ManWil002", 66104 ) { }
ManWil002() : EventScript( 66104 ) { }
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
{

2
scripts/native/quest/subquest/gridania/SubFst001.cpp
View file

@ -60,7 +60,7 @@ private:
public:
SubFst001() : EventScript( "SubFst001", 65560 ) {}
SubFst001() : EventScript( 65560 ) {}
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
{

2
scripts/native/quest/subquest/gridania/SubFst002.cpp
View file

@ -46,7 +46,7 @@ private:
}
public:
SubFst002() : EventScript( "SubFst002", 65561 ) {}
SubFst002() : EventScript( 65561 ) {}
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
{

2
scripts/native/quest/subquest/gridania/SubFst010.cpp
View file

@ -42,7 +42,7 @@ private:
}
public:
SubFst010() : EventScript( "SubFst010", 65537 ) {}
SubFst010() : EventScript( 65537 ) {}
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
{

2
scripts/native/quest/subquest/gridania/SubFst013.cpp
View file

@ -148,7 +148,7 @@ private:
public:
SubFst013() : EventScript( "SubFst013", 65576 ) {}
SubFst013() : EventScript( 65576 ) {}
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
{

29
src/servers/sapphire_zone/Script/NativeScriptApi.h
View file

@ -24,22 +24,15 @@ using namespace Core;
class ScriptObject
{
protected:
std::string m_scriptName;
uint32_t m_id;
std::size_t m_type;
public:
ScriptObject( std::string name, uint32_t id, std::size_t type ) :
m_scriptName( name ),
ScriptObject( uint32_t id, std::size_t type ) :
m_id( id ),
m_type( type )
{ }
virtual const std::string& getName() const
{
return m_scriptName;
}
virtual uint32_t getId() const
{
return m_id;
@ -55,8 +48,8 @@ public:
class StatusEffectScript : public ScriptObject
{
public:
StatusEffectScript( std::string name, uint32_t effectId ) :
ScriptObject( name, effectId, typeid( StatusEffectScript ).hash_code() )
StatusEffectScript( uint32_t effectId ) :
ScriptObject( effectId, typeid( StatusEffectScript ).hash_code() )
{ }
virtual void onTick( Entity::Actor& actor ) { }
@ -73,8 +66,8 @@ public:
class ActionScript : public ScriptObject
{
public:
ActionScript( std::string name, uint32_t abilityId ) :
ScriptObject( name, abilityId, typeid( ActionScript ).hash_code() )
ActionScript( uint32_t abilityId ) :
ScriptObject( abilityId, typeid( ActionScript ).hash_code() )
{ }
virtual void onStart( Entity::Actor& sourceActor, Entity::Actor& targetActor ) { }
@ -86,8 +79,8 @@ public:
class EventScript : public ScriptObject
{
public:
EventScript( std::string name, uint32_t questId ) :
ScriptObject( name, questId, typeid( EventScript ).hash_code() )
EventScript( uint32_t questId ) :
ScriptObject( questId, typeid( EventScript ).hash_code() )
{ }
virtual void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) { }
@ -104,16 +97,16 @@ public:
class BattleNpcScript : public ScriptObject
{
public:
BattleNpcScript( std::string name, uint32_t npcId ) :
ScriptObject( name, npcId, typeid( BattleNpcScript ).hash_code() )
BattleNpcScript( uint32_t npcId ) :
ScriptObject( npcId, typeid( BattleNpcScript ).hash_code() )
{ }
};
class ZoneScript : public ScriptObject
{
public:
ZoneScript( std::string name, uint32_t zoneId ) :
ScriptObject( name, zoneId, typeid( ZoneScript ).hash_code() )
ZoneScript( uint32_t zoneId ) :
ScriptObject( zoneId, typeid( ZoneScript ).hash_code() )
{ }
virtual void onZoneInit() { }