[<bazaarmagetron@us...>]

Revision: 8269
          http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8269&view=rev
Author:   bazaarmagetron
Date:     2008-03-06 10:48:38 -0800 (Thu, 06 Mar 2008)

Log Message:
-----------
Manuel Moos: added FORTRESS_COLLAPSE_SPEED to control the time between the conquest of a zone and the vanishing (and killing of the team members)

Modified Paths:
--------------
    armagetronad/branches/0.2.8/armagetronad/config/settings.cfg
    armagetronad/branches/0.2.8/armagetronad/src/tron/gWinZone.cpp

Property Changed:
----------------
    armagetronad/branches/0.2.8/armagetronad/


Property changes on: armagetronad/branches/0.2.8/armagetronad
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2008-03-06 01:20:55.526000023 +0100
committer: Manuel Moos <z-man@...>
properties: 
	branch-nick: armagetronad

   + timestamp: 2008-03-06 19:42:05.846999884 +0100
committer: Manuel Moos <z-man@...>
properties: 
	branch-nick: armagetronad

Name: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs
   - 538 z-man@...
540 z-man@...
541 z-man@...
542 z-man@...
543 z-man@...
544 z-man@...
545 z-man@...
546 z-man@...
551 z-man@...
552 z-man@...
553 z-man@...
561 z-man@...
563 wrtlprnft@...
564 z-man@...
565 z-man@...
566 z-man@...
567 z-man@...
568 z-man@...
569 z-man@...
570 z-man@...
571 z-man@...
572 z-man@...
573 z-man@...
574 z-man@...
575 z-man@...
576 z-man@...
577 z-man@...
578 z-man@...
579 z-man@...
580 wrtlprnft@...
581 z-man@...
582 z-man@...
583 z-man@...
584 z-man@...
585 z-man@...
586 z-man@...
587 z-man@...
588 z-man@...
589 z-man@...
590 z-man@...
591 z-man@...
592 z-man@...
593 z-man@...
594 z-man@...
595 z-man@...
596 z-man@...
597 z-man@...
598 z-man@...
599 z-man@...
600 z-man@...
601 z-man@...
602 z-man@...
603 z-man@...
604 z-man@...
605 z-man@...
606 z-man@...
607 z-man@...
608 z-man@...
609 z-man@...
610 z-man@...
611 z-man@...
612 z-man@...
613 z-man@...
614 z-man@...
615 z-man@...
616 z-man@...
618 z-man@...
619 z-man@...
620 z-man@...
621 z-man@...
622 z-man@...
623 z-man@...
624 z-man@...
627 z-man@...
630 z-man@...
631 z-man@...
632 z-man@...
633 z-man@...
634 z-man@...
635 z-man@...
636 z-man@...
637 z-man@...
638 z-man@...
639 z-man@...
640 z-man@...
641 z-man@...
642 z-man@...
644 z-man@...
645 z-man@...
646 z-man@...
647 z-man@...
648 z-man@...
649 z-man@...
650 z-man@...
651 z-man@...
652 z-man@...
653 z-man@...
655 z-man@...
656 z-man@...
658 z-man@...
659 z-man@...
660 z-man@...
661 z-man@...
662 z-man@...
665 z-man@...
666 z-man@...
672 z-man@...
673 z-man@...
674 z-man@...
675 z-man@...
676 z-man@...
677 z-man@...
678 z-man@...
679 z-man@...
680 z-man@...
681 z-man@...
682 z-man@...
683 z-man@...
684 z-man@...
685 z-man@...
687 z-man@...
688 z-man@...
689 z-man@...
694 z-man@...
695 z-man@...
696 z-man@...
697 z-man@...
698 z-man@...
699 z-man@...
700 z-man@...
701 z-man@...
702 z-man@...

   + 538 z-man@...
540 z-man@...
541 z-man@...
542 z-man@...
543 z-man@...
544 z-man@...
545 z-man@...
546 z-man@...
551 z-man@...
552 z-man@...
553 z-man@...
561 z-man@...
563 wrtlprnft@...
564 z-man@...
565 z-man@...
566 z-man@...
567 z-man@...
568 z-man@...
569 z-man@...
570 z-man@...
571 z-man@...
572 z-man@...
573 z-man@...
574 z-man@...
575 z-man@...
576 z-man@...
577 z-man@...
578 z-man@...
579 z-man@...
580 wrtlprnft@...
581 z-man@...
582 z-man@...
583 z-man@...
584 z-man@...
585 z-man@...
586 z-man@...
587 z-man@...
588 z-man@...
589 z-man@...
590 z-man@...
591 z-man@...
592 z-man@...
593 z-man@...
594 z-man@...
595 z-man@...
596 z-man@...
597 z-man@...
598 z-man@...
599 z-man@...
600 z-man@...
601 z-man@...
602 z-man@...
603 z-man@...
604 z-man@...
605 z-man@...
606 z-man@...
607 z-man@...
608 z-man@...
609 z-man@...
610 z-man@...
611 z-man@...
612 z-man@...
613 z-man@...
614 z-man@...
615 z-man@...
616 z-man@...
618 z-man@...
619 z-man@...
620 z-man@...
621 z-man@...
622 z-man@...
623 z-man@...
624 z-man@...
627 z-man@...
630 z-man@...
631 z-man@...
632 z-man@...
633 z-man@...
634 z-man@...
635 z-man@...
636 z-man@...
637 z-man@...
638 z-man@...
639 z-man@...
640 z-man@...
641 z-man@...
642 z-man@...
644 z-man@...
645 z-man@...
646 z-man@...
647 z-man@...
648 z-man@...
649 z-man@...
650 z-man@...
651 z-man@...
652 z-man@...
653 z-man@...
655 z-man@...
656 z-man@...
658 z-man@...
659 z-man@...
660 z-man@...
661 z-man@...
662 z-man@...
665 z-man@...
666 z-man@...
672 z-man@...
673 z-man@...
674 z-man@...
675 z-man@...
676 z-man@...
677 z-man@...
678 z-man@...
679 z-man@...
680 z-man@...
681 z-man@...
682 z-man@...
683 z-man@...
684 z-man@...
685 z-man@...
687 z-man@...
688 z-man@...
689 z-man@...
694 z-man@...
695 z-man@...
696 z-man@...
697 z-man@...
698 z-man@...
699 z-man@...
700 z-man@...
701 z-man@...
702 z-man@...
708 z-man@...


Modified: armagetronad/branches/0.2.8/armagetronad/config/settings.cfg
===================================================================
--- armagetronad/branches/0.2.8/armagetronad/config/settings.cfg	2008-03-06 14:37:25 UTC (rev 8268)
+++ armagetronad/branches/0.2.8/armagetronad/config/settings.cfg	2008-03-06 18:48:38 UTC (rev 8269)
@@ -527,6 +527,7 @@
 # what happens when a zone gets conquered
 
 FORTRESS_CONQUERED_SCORE 0        # the conquering party gets this many points (divided among the conquerors)
+FORTRESS_HELD_SCORE 0             # points a team owning a zone gets at the end of the round if both team and zone survived
 FORTRESS_CONQUERED_WIN 0          # if set to 1, the conquering party wins the round
 FORTRESS_CONQUERED_KILL_MIN 0     # the closest X players of the owning team get killed at least
 FORTRESS_CONQUERED_KILL_RATIO 0.0 # this fraction of the players of the owning team get killed
@@ -536,6 +537,8 @@
 
 SPAWN_POINT_GROUP_SIZE 0          # if > 2, this is interpreted as the number of spawn points in a spawn point group. AA then tries not to spawn one player alone in one spawn point group by redistributing them slightly.
 
+FORTRESS_COLLAPSE_SPEED .5        # speed (units: 1/s) at which a collapsing fortress vanisues. The inverse of this value is the time between the conquest and the time the zone vanishes (and potentially kills its owners)
+
 ############################################################################################
 #
 # backward network compatibility

Modified: armagetronad/branches/0.2.8/armagetronad/src/tron/gWinZone.cpp
===================================================================
--- armagetronad/branches/0.2.8/armagetronad/src/tron/gWinZone.cpp	2008-03-06 14:37:25 UTC (rev 8268)
+++ armagetronad/branches/0.2.8/armagetronad/src/tron/gWinZone.cpp	2008-03-06 18:48:38 UTC (rev 8269)
@@ -779,6 +779,10 @@
 static int sg_onSurviveScore = 0;
 static tSettingItem< int > sg_onSurviveConquestScoreConfig( "FORTRESS_HELD_SCORE", sg_onSurviveScore );
 
+static REAL sg_collapseSpeed = .5;
+static tSettingItem< REAL > sg_collapseSpeedConfig( "FORTRESS_COLLAPSE_SPEED", sg_collapseSpeed );
+
+
 // *******************************************************************************
 // *
 // *	Timestep
@@ -795,12 +799,20 @@
     {
         // let zone vanish
         SetReferenceTime();
-        SetExpansionSpeed( -GetRadius()*.5 );
+        SetExpansionSpeed( -GetRadius()*sg_collapseSpeed );
         SetRotationAcceleration( -GetRotationSpeed()*.4 );
         RequestSync();
 
         currentState_ = State_Conquered;
     }
+    else if ( currentState_ == State_Conquered && GetRotationSpeed() < -.3 )
+    {
+        // let zone vanish
+        SetReferenceTime();
+        SetRotationSpeed( -.3 );
+        SetRotationAcceleration( 0 );
+        RequestSync();
+    }
 
     REAL dt = time - lastTime;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.