| changeset 13030 | da691787fcd2 |
| parent 13029 | 905449169319 |
| child 13643 | 690cc84e9fd6 |
| 13029:905449169319 | 13030:da691787fcd2 |
|---|---|
497 end |
497 end |
498 |
498 |
499 return ammo |
499 return ammo |
500 end |
500 end |
501 |
501 |
502 function updatePointsLabel(team) |
|
503 SetTeamLabel(team, string.format(loc("%d / %d"), pointsPerTeam[team]["weapons"], pointsPerTeam[team]["helpers"])) |
|
504 end |
|
505 |
|
502 function addTurnAmmo(hog) |
506 function addTurnAmmo(hog) |
503 -- Check if hog is valid |
507 -- Check if hog is valid |
504 if hog == nil then |
508 if hog == nil then |
505 return |
509 return |
506 end |
510 end |
1201 return |
1205 return |
1202 end |
1206 end |
1203 |
1207 |
1204 pointsPerTeam[team]['weapons'] = pointsPerTeam[team]['weapons'] + 2 |
1208 pointsPerTeam[team]['weapons'] = pointsPerTeam[team]['weapons'] + 2 |
1205 pointsPerTeam[team]['helpers'] = pointsPerTeam[team]['helpers'] + 1 |
1209 pointsPerTeam[team]['helpers'] = pointsPerTeam[team]['helpers'] + 1 |
1210 updatePointsLabel(team) |
|
1206 |
1211 |
1207 local effect = AddVisualGear(GetX(CurHog) - (cratePickupGap / 2), GetY(CurHog), vgtHealthTag, 2, false) |
1212 local effect = AddVisualGear(GetX(CurHog) - (cratePickupGap / 2), GetY(CurHog), vgtHealthTag, 2, false) |
1208 -- Set Tint |
1213 -- Set Tint |
1209 SetVisualGearValues(effect, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0xFFFFFFFF) |
1214 SetVisualGearValues(effect, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0xFFFFFFFF) |
1210 |
1215 |
1378 pointsPerTeam[team]['helpers'] = pointsPerTeam[team]['helpersRem'] + hlpWoTax + div(hlpToTax * pointsKeepPerc, 100) |
1383 pointsPerTeam[team]['helpers'] = pointsPerTeam[team]['helpersRem'] + hlpWoTax + div(hlpToTax * pointsKeepPerc, 100) |
1379 else |
1384 else |
1380 pointsPerTeam[team]['weapons'] = pointsPerTeam[team]['weaponsRem'] + wepWoTax + div(wepToTax * pointsKeepSDPerc, 100) |
1385 pointsPerTeam[team]['weapons'] = pointsPerTeam[team]['weaponsRem'] + wepWoTax + div(wepToTax * pointsKeepSDPerc, 100) |
1381 pointsPerTeam[team]['helpers'] = pointsPerTeam[team]['helpersRem'] + hlpWoTax + div(hlpToTax * pointsKeepSDPerc, 100) |
1386 pointsPerTeam[team]['helpers'] = pointsPerTeam[team]['helpersRem'] + hlpWoTax + div(hlpToTax * pointsKeepSDPerc, 100) |
1382 end |
1387 end |
1388 |
|
1389 updatePointsLabel(team) |
|
1383 |
1390 |
1384 local effect = AddVisualGear(GetX(hog) - (cratePickupGap / 2), GetY(hog), vgtHealthTag, pointsPerTeam[team]['weapons'], false) |
1391 local effect = AddVisualGear(GetX(hog) - (cratePickupGap / 2), GetY(hog), vgtHealthTag, pointsPerTeam[team]['weapons'], false) |
1385 -- Set Tint |
1392 -- Set Tint |
1386 SetVisualGearValues(effect, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0xFFFFFFFF) |
1393 SetVisualGearValues(effect, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0xFFFFFFFF) |
1387 |
1394 |
1607 for key, val in pairs(teamNames) do |
1614 for key, val in pairs(teamNames) do |
1608 if mode == 'points' then |
1615 if mode == 'points' then |
1609 pointsPerTeam[key] = {} |
1616 pointsPerTeam[key] = {} |
1610 pointsPerTeam[key]['weapons'] = pointsWepBase |
1617 pointsPerTeam[key]['weapons'] = pointsWepBase |
1611 pointsPerTeam[key]['helpers'] = pointsHlpBase |
1618 pointsPerTeam[key]['helpers'] = pointsHlpBase |
1619 updatePointsLabel(key) |
|
1612 else |
1620 else |
1613 setTeamHogs(key) |
1621 setTeamHogs(key) |
1614 end |
1622 end |
1615 end |
1623 end |
1616 |
1624 |