mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-10-04 03:11:53 +02:00
Code Issues Projects Releases Wiki Activity

- added a bit more lua and updated capture enemy flag

Browse Source
This commit is contained in:
Mark Vejvoda
2012-10-13 07:33:33 +00:00
parent 0180aa6bba
commit e63e634e1e
11 changed files with 346 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
source/glest_game/game/script_manager.cpp
View File

@@ -371,6 +371,9 @@ void ScriptManager::init(World* world, GameCamera *gameCamera, const XmlNode *ro
luaScript.registerFunction(getHumanFactionId, "humanFaction");
luaScript.registerFunction(highlightUnit, "highlightUnit");
luaScript.registerFunction(unhighlightUnit, "unhighlightUnit");
//load code
for(int i= 0; i<scenario->getScriptCount(); ++i){
const Script* script= scenario->getScript(i);
@@ -683,14 +686,30 @@ void ScriptManager::onCellTriggerEvent(Unit *movingUnit) {
{
if(movingUnit->getId() == event.sourceId) {
bool srcInDst = false;
for(int x = event.destPos.x; srcInDst == false && x <= event.destPosEnd.x; ++x) {
for(int y = event.destPos.y; srcInDst == false && y <= event.destPosEnd.y; ++y) {
srcInDst = world->getMap()->isInUnitTypeCells(movingUnit->getType(), Vec2i(x,y),movingUnit->getPos());
if(SystemFlags::getSystemSettingType(SystemFlags::debugLUA).enabled) SystemFlags::OutputDebug(SystemFlags::debugLUA,"In [%s::%s Line: %d] movingUnit = %d, event.type = %d, movingUnit->getPos() = %s, event.sourceId = %d, event.destId = %d, event.destPos = %s, srcInDst = %d\n",
__FILE__,__FUNCTION__,__LINE__,movingUnit->getId(),event.type,movingUnit->getPos().getString().c_str(),event.sourceId,event.destId,Vec2i(x,y).getString().c_str(),srcInDst);
// Cache area lookup so for each unitsize and pos its done only once
bool foundInCache = false;
std::map<int,std::map<Vec2i,bool> >::iterator iterFind1 = event.eventLookupCache.find(movingUnit->getType()->getSize());
if(iterFind1 != event.eventLookupCache.end()) {
std::map<Vec2i,bool>::iterator iterFind2 = iterFind1->second.find(movingUnit->getPos());
if(iterFind2 != iterFind1->second.end()) {
foundInCache = true;
srcInDst = iterFind2->second;
}
}
if(foundInCache == false) {
for(int x = event.destPos.x; srcInDst == false && x <= event.destPosEnd.x; ++x) {
for(int y = event.destPos.y; srcInDst == false && y <= event.destPosEnd.y; ++y) {
srcInDst = world->getMap()->isInUnitTypeCells(movingUnit->getType(), Vec2i(x,y),movingUnit->getPos());
if(SystemFlags::getSystemSettingType(SystemFlags::debugLUA).enabled) SystemFlags::OutputDebug(SystemFlags::debugLUA,"In [%s::%s Line: %d] movingUnit = %d, event.type = %d, movingUnit->getPos() = %s, event.sourceId = %d, event.destId = %d, event.destPos = %s, srcInDst = %d\n",
__FILE__,__FUNCTION__,__LINE__,movingUnit->getId(),event.type,movingUnit->getPos().getString().c_str(),event.sourceId,event.destId,Vec2i(x,y).getString().c_str(),srcInDst);
}
}
event.eventLookupCache[movingUnit->getType()->getSize()][movingUnit->getPos()] = srcInDst;
}
if(srcInDst == true) {
if(SystemFlags::getSystemSettingType(SystemFlags::debugLUA).enabled) SystemFlags::OutputDebug(SystemFlags::debugLUA,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
}
@@ -750,15 +769,32 @@ void ScriptManager::onCellTriggerEvent(Unit *movingUnit) {
//if(event.sourceId == 1) printf("ctet_FactionPos event.destPos = [%s], movingUnit->getPos() [%s] Unit id = %d\n",event.destPos.getString().c_str(),movingUnit->getPos().getString().c_str(),movingUnit->getId());
bool srcInDst = false;
for(int x = event.destPos.x; srcInDst == false && x <= event.destPosEnd.x; ++x) {
for(int y = event.destPos.y; srcInDst == false && y <= event.destPosEnd.y; ++y) {
srcInDst = world->getMap()->isInUnitTypeCells(movingUnit->getType(), Vec2i(x,y),movingUnit->getPos());
if(srcInDst == true) {
if(SystemFlags::getSystemSettingType(SystemFlags::debugLUA).enabled) SystemFlags::OutputDebug(SystemFlags::debugLUA,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
}
// Cache area lookup so for each unitsize and pos its done only once
bool foundInCache = false;
std::map<int,std::map<Vec2i,bool> >::iterator iterFind1 = event.eventLookupCache.find(movingUnit->getType()->getSize());
if(iterFind1 != event.eventLookupCache.end()) {
std::map<Vec2i,bool>::iterator iterFind2 = iterFind1->second.find(movingUnit->getPos());
if(iterFind2 != iterFind1->second.end()) {
foundInCache = true;
srcInDst = iterFind2->second;
}
}
if(foundInCache == false) {
for(int x = event.destPos.x; srcInDst == false && x <= event.destPosEnd.x; ++x) {
for(int y = event.destPos.y; srcInDst == false && y <= event.destPosEnd.y; ++y) {
srcInDst = world->getMap()->isInUnitTypeCells(movingUnit->getType(), Vec2i(x,y),movingUnit->getPos());
if(srcInDst == true) {
if(SystemFlags::getSystemSettingType(SystemFlags::debugLUA).enabled) SystemFlags::OutputDebug(SystemFlags::debugLUA,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
}
}
}
event.eventLookupCache[movingUnit->getType()->getSize()][movingUnit->getPos()] = srcInDst;
}
triggerEvent = srcInDst;
if(triggerEvent == true) {
//printf("!!!UNIT IN AREA!!! Faction area pos, moving unit faction= %d, trigger faction = %d, unit id = %d\n",movingUnit->getFactionIndex(),event.sourceId,movingUnit->getId());
@@ -1680,6 +1716,20 @@ int ScriptManager::getHumanFactionId() {
return this->world->getThisFactionIndex();
}
void ScriptManager::highlightUnit(int unitId, float radius, float thickness, Vec4f color) {
if(SystemFlags::getSystemSettingType(SystemFlags::debugLUA).enabled) SystemFlags::OutputDebug(SystemFlags::debugLUA,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
ScriptManager_STREFLOP_Wrapper streflopWrapper;
world->highlightUnit(unitId, radius, thickness, color);
}
void ScriptManager::unhighlightUnit(int unitId) {
if(SystemFlags::getSystemSettingType(SystemFlags::debugLUA).enabled) SystemFlags::OutputDebug(SystemFlags::debugLUA,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
ScriptManager_STREFLOP_Wrapper streflopWrapper;
world->unhighlightUnit(unitId);
}
// ========================== lua callbacks ===============================================
int ScriptManager::showMessage(LuaHandle* luaHandle){
@@ -2659,6 +2709,18 @@ int ScriptManager::getHumanFactionId(LuaHandle* luaHandle) {
return luaArguments.getReturnCount();
}
int ScriptManager::highlightUnit(LuaHandle* luaHandle) {
LuaArguments luaArguments(luaHandle);
thisScriptManager->highlightUnit(luaArguments.getInt(-4), luaArguments.getFloat(-3), luaArguments.getFloat(-2), luaArguments.getVec4f(-1));
return luaArguments.getReturnCount();
}
int ScriptManager::unhighlightUnit(LuaHandle* luaHandle) {
LuaArguments luaArguments(luaHandle);
thisScriptManager->unhighlightUnit(luaArguments.getInt(-1));
return luaArguments.getReturnCount();
}
void ScriptManager::saveGame(XmlNode *rootNode) {
std::map<string,string> mapTagReplacements;
XmlNode *scriptManagerNode = rootNode->addChild("ScriptManager");