Show Posts
This section allows you to view all posts made by this member. Note that you can only see posts made in areas you currently have access to.
./glest.bin -validate-techtrees=megapack./glest.bin -validate-techtrees=megapack=purgeunusedglest.bin --convert-models=techs/megapack_new/=png<softcoder> any thoughts on this post: https://forum.megaglest.org/index.php?topic=6533.msg67087#msg67087Stickied and *quoted*! Good Luck! -Ultifd
<silnarm> hi, give me a moment..
<silnarm> ok... so how would you propose we went about a 'combined effort' merge ?
<softcoder> #1 do you want to
<softcoder> ?
<silnarm> Yes
<silnarm> _merge_
<softcoder> ok.
<silnarm> not port features to MG
<softcoder> ok, I understand
<softcoder> I think we then need to determine which parts to merge and which to drop
<softcoder> I'm sure on both sides there are redundant pieces so we determine which would be best.
<softcoder> other areas we simple take a file at a time and merge
<softcoder> now if possible.. we could plan it in pieces so that things are still playable and therefore testable
<silnarm> there are numerous architectural differences, that effect many different files.
<softcoder> sure, its not a small task, but like i said if there is a desire now is the time
<softcoder> and it would be worth having one umbrella and effort
<silnarm> so there would be many files that simply couldn't be merged in isolation
<softcoder> yes sections of the code
<silnarm> yes, absolutely
<softcoder> thats why i think we can take slices and detrermine in some cases to ditch some and take others
<silnarm> if we use git, we can put the data in a sub-module, so the core project is 'code only'
<softcoder> yes... we can use git
<softcoder> in the sense of what we are doing and going forward it seems to make sense
<softcoder> ok, an execercise then..
<softcoder> step #1
<softcoder> we need to look at both code bases to determine how to split
<softcoder> also.. would you have buy-in from GAE members?
<softcoder> and how would you want it hoated etc?
<silnarm> unknown
<softcoder> hosted
<softcoder> ok.. please do that first then
<silnarm> that is another good question
<silnarm> I'll mail hailstone and Yggdrasil to see what they think
<softcoder> ok.. talk to your guys.. I'll chat with titi and lets see what we come up with
<silnarm> what would you suggest in terms of hosting?
<silnarm> new proj?
<softcoder> I honestly don't care
<silnarm> ok
<softcoder> lets take ideas from all involved
<silnarm> yes, that would be ideal...
<softcoder> ok cool, its a long road, but if we work hard together it'll be awesome
<softcoder> the expertise would make a monster of an RTS
<silnarm> agreed
<softcoder> ok, I'm glad... will mail the MG guys now
<silnarm> ok, I'll do likewise.
<?xml version="1.0" standalone="yes" ?>
<scenario>
<difficulty value="3"/>
<players>
<player control="human" faction="tech" team="1"/>
<player control="cpu" faction="tech" team="2"/>
<player control="cpu" faction="tech" team="2"/>
<player control="cpu" faction="tech" team="2"/>
</players>
<map value="in_the_forest"/>
<tileset value="forest"/>
<tech-tree value="megapack"/>
<default-resources value="false"/>
<default-units value="false"/>
<default-victory-conditions value="false"/>
<scripts>
<startup>
print( 'Test, START of Capture the flag!' )
--disable AI
disableAi(1)
disableAi(2)
disableAi(3)
disableConsume(0)
unitA = 'guard'
unitB = 'castle'
captureTheFlagSeconds = 90
DisplayFormattedText('You have %s seconds to move the %s into the %s!', captureTheFlagSeconds,unitA, unitB)
for i=0, 3 do
print( 'Is AI enabled for faction index: ' .. i .. ', ' .. tostring( getAiEnabled(i)) )
print( 'Is consume enabled for faction index: ' .. i .. ', ' .. tostring( getConsumeEnabled(i)) )
end
--allied units
--createUnit('farm', 0, startLocation(2))
createUnit(unitB, 1, startLocation(2))
enemyCastle= lastCreatedUnit()
castleUnit= lastCreatedUnit()
createUnit('worker', 1, startLocation(2))
enemyWorker= lastCreatedUnit()
for i=1, 5 do
createUnit('swordman', 1, startLocation(2))
end
giveResource('gold', 0, 1000);
giveResource('wood', 0, 1000);
giveResource('food', 0, 1000);
giveResource('food', 1, 5);
--player units
createUnit('battle_machine', 0, startLocation(1))
battle_machine= lastCreatedUnit()
createUnit(unitA, 0, startLocation(2))
guard= lastCreatedUnit()
moveToUnit(guard,enemyWorker)
createUnit('technician', 0, startLocation(1))
technician= lastCreatedUnit()
moveToUnit(technician,enemyCastle)
createUnit('battle_machine', 0, startLocation(1))
bm2= lastCreatedUnit()
for i=1, 3 do
createUnit('archer', 0, startLocation(2))
test = lastCreatedUnit()
giveAttackCommand(test, castleUnit)
end
for i=1, 10 do
createUnit('swordman', 0, startLocation(1))
givePositionCommand(lastCreatedUnit(), 'attack', startLocation(1))
end
cell_event1 = registerCellTriggerEventForUnitToUnit(guard,castleUnit)
print( 'cell_event1 = ' .. cell_event1 )
cell_event2 = registerCellTriggerEventForUnitToUnit(battle_machine,castleUnit)
print( 'cell_event2 = ' .. cell_event2 )
timer_event1 = startTimerEvent()
print( 'timer_event1 = ' .. timer_event1 )
setCameraPosition(unitPosition(guard))
</startup>
<unitCreated>
</unitCreated>
<unitDied>
enableConsume(0)
enableAi(1)
enableAi(2)
enableAi(3)
for i=0, 3 do
print( 'Is AI enabled for faction index: ' .. i .. ', ' .. tostring( getAiEnabled(i)) )
print( 'Is consume enabled for faction index: ' .. i .. ', ' .. tostring( getConsumeEnabled(i)) )
end
clearDisplayText()
print( 'About to morph unit: ' .. technician )
morphToUnit(technician,'build_air_ballista',1)
destroyUnit(battle_machine);
giveAttackStoppedCommand(bm2,'hold_position',1)
playStreamingSound('/home/softcoder/Code/megaglest/trunk/data/glest_game/techs/megapack/factions/romans_beta/music/romans.ogg')
print( 'Done morphing...' )
</unitDied>
<cellTriggerEvent>
--print('Cell Event ' .. triggeredCellEventId() )
--print( 'In cell event triggeredCellEventId = ' .. triggeredCellEventId() .. ' cell_event1 = ' .. cell_event1 .. ' cell_event2 = ' .. cell_event2 )
if triggeredCellEventId() == cell_event1 or triggeredCellEventId() == cell_event2 then
clearDisplayText()
DisplayFormattedText('You captured the FLAG!')
stopTimerEvent(timer_event1)
unregisterCellTriggerEvent(cell_event1)
unregisterCellTriggerEvent(cell_event2)
end
</cellTriggerEvent>
<timerTriggerEvent>
--print('Timer Event ' .. triggeredTimerEventId() )
--print( 'In timer event triggeredTimerEventId = ' .. triggeredTimerEventId() .. ' timer_event1 = ' .. timer_event1 )
if triggeredTimerEventId() == timer_event1 then
if timerEventSecondsElapsed(triggeredTimerEventId()) >= captureTheFlagSeconds then
print( 'In timer event triggeredTimerEventId = ' .. triggeredTimerEventId() .. ' timer_event1 = ' .. timer_event1 .. ' seconds elapsed = ' .. timerEventSecondsElapsed(triggeredTimerEventId()) )
clearDisplayText()
DisplayFormattedText('Your time ran out of time to capture the FLAG!')
stopTimerEvent(timer_event1)
unregisterCellTriggerEvent(cell_event1)
unregisterCellTriggerEvent(cell_event2)
endGame()
end
end
</timerTriggerEvent>
</scripts>
</scenario>
<?xml version="1.0" standalone="yes" ?>
<scenario>
<difficulty value="3"/>
<players>
<player control="human" faction="tech" team="1"/>
<player control="cpu" faction="tech" team="1"/>
<player control="cpu" faction="tech" team="1"/>
<player control="cpu" faction="tech" team="1"/>
</players>
<map value="in_the_forest"/>
<tileset value="forest"/>
<tech-tree value="megapack"/>
<default-resources value="false"/>
<default-units value="false"/>
<default-victory-conditions value="true"/>
<scripts>
<startup>
--disable AI
disableAi(1)
disableAi(2)
disableAi(3)
disableHunger(0)
age = 37
you = 17
DisplayFormattedText('I am %s years old. You are %s', age, you)
for i=0, 3 do
print( 'Is AI enabled for faction index: ' .. i .. ', ' .. tostring( getAiEnabled(i)) )
print( 'Is hunger enabled for faction index: ' .. i .. ', ' .. tostring( getHungerEnabled(i)) )
end
startPerformanceTimer()
--allied units
--createUnit('farm', 0, startLocation(2))
createUnit('castle', 1, startLocation(2))
castleUnit= lastCreatedUnit()
createUnit('worker', 1, startLocation(2))
for i=1, 5 do
createUnit('swordman', 1, startLocation(2))
end
giveResource('gold', 0, 1000);
giveResource('wood', 0, 1000);
giveResource('food', 0, 1000);
giveResource('food', 1, 5);
--player units
createUnit('battle_machine', 0, startLocation(2))
battle_machine= lastCreatedUnit()
createUnit('guard', 0, startLocation(2))
guard= lastCreatedUnit()
for i=1, 3 do
createUnit('archer', 0, startLocation(2))
giveAttackCommand(lastCreatedUnit(), castleUnit)
end
for i=1, 10 do
createUnit('swordman', 0, startLocation(1))
givePositionCommand(lastCreatedUnit(), 'attack', startLocation(1))
end
cell_event1 = registerCellTriggerEventForUnitToUnit(guard,castleUnit)
print( 'cell_event1 = ' .. cell_event1 )
timer_event1 = startTimerEvent()
print( 'timer_event1 = ' .. timer_event1 )
</startup>
<unitCreated>
</unitCreated>
<unitDied>
enableHunger(0)
enableAi(1)
for i=0, 3 do
print( 'Is AI enabled for faction index: ' .. i .. ', ' .. tostring( getAiEnabled(i)) )
print( 'Is hunger enabled for faction index: ' .. i .. ', ' .. tostring( getHungerEnabled(i)) )
end
endPerformanceTimer()
clearDisplayText()
setDisplayText(string.format('Performance, updateFPS: %d, RenderFPS: %d', getPerformanceTimerResults()[1],getPerformanceTimerResults()[2]))
</unitDied>
<cellTriggerEvent>
--print('Cell Event ' .. triggeredCellEventId() )
print( 'In cell event triggeredCellEventId = ' .. triggeredCellEventId() .. ' cell_event1 = ' .. cell_event1 )
if triggeredCellEventId() == cell_event1 then
clearDisplayText()
setDisplayText('You captured the FLAG!')
end
</cellTriggerEvent>
<timerTriggerEvent>
--print('Timer Event ' .. triggeredTimerEventId() )
--print( 'In timer event triggeredTimerEventId = ' .. triggeredTimerEventId() .. ' timer_event1 = ' .. timer_event1 )
if triggeredTimerEventId() == timer_event1 then
if timerEventSecondsElapsed(triggeredTimerEventId()) >= 7 then
print( 'In timer event triggeredTimerEventId = ' .. triggeredTimerEventId() .. ' timer_event1 = ' .. timer_event1 .. ' seconds elapsed = ' .. timerEventSecondsElapsed(triggeredTimerEventId()) )
clearDisplayText()
setDisplayText('Timer 1 triggered!')
stopTimerEvent(timer_event1)
end
end
</timerTriggerEvent>
</scripts>
</scenario>