File tree Expand file tree Collapse file tree 2 files changed +13
-2
lines changed Expand file tree Collapse file tree 2 files changed +13
-2
lines changed Original file line number Diff line number Diff line change @@ -41,8 +41,18 @@ func (x *Config) ReadFrom(fileName string) (err error) {
4141 if x .AutoRefConfigs == nil {
4242 x .AutoRefConfigs = defConfig .AutoRefConfigs
4343 }
44+ for key , value := range defConfig .AutoRefConfigs {
45+ if _ , ok := x .AutoRefConfigs [key ]; ! ok {
46+ x .AutoRefConfigs [key ] = value
47+ }
48+ }
4449 if x .GameEventBehavior == nil {
45- x .GameEventBehavior = defConfig .GameEventBehavior
50+ x .GameEventBehavior = map [string ]Config_Behavior {}
51+ }
52+ for key , value := range defConfig .GameEventBehavior {
53+ if _ , ok := x .GameEventBehavior [key ]; ! ok {
54+ x .GameEventBehavior [key ] = value
55+ }
4656 }
4757 if len (x .Teams ) == 0 {
4858 x .Teams = defConfig .Teams
Original file line number Diff line number Diff line change @@ -74,7 +74,8 @@ func GameEventsForBehaviorConfig() (a []GameEvent_Type) {
7474 GameEvent_ATTACKER_DOUBLE_TOUCHED_BALL ,
7575 GameEvent_PLACEMENT_SUCCEEDED ,
7676 GameEvent_PENALTY_KICK_FAILED ,
77- GameEvent_NO_PROGRESS_IN_GAME :
77+ GameEvent_NO_PROGRESS_IN_GAME ,
78+ GameEvent_TOO_MANY_ROBOTS :
7879 a = append (a , eventType )
7980 default :
8081 // ignore
You can’t perform that action at this time.
0 commit comments