merge
authornemo
Fri, 05 Nov 2010 15:37:36 -0400
changeset 4134 3dc32c1fb97b
parent 4132 ca33a3737064 (diff)
parent 4133 cd0435def5e8 (current diff)
child 4135 5be798ecafdc
merge
--- a/hedgewars/uLocale.pas	Fri Nov 05 20:08:15 2010 +0100
+++ b/hedgewars/uLocale.pas	Fri Nov 05 15:37:36 2010 -0400
@@ -43,7 +43,7 @@
     TGoalStrId = (gidCaption, gidSubCaption, gidForts, gidLowGravity, gidInvulnerable,
             gidVampiric, gidKarma, gidKing, gidPlaceHog, gidArtillery,
             gidSolidLand, gidSharedAmmo, gidMineTimer, gidNoMineTimer, gidRandomMineTimer,
-            gidDamageModifier);
+            gidDamageModifier, gidResetHealth, gidAISurvival, gidInfAttack, gidResetWeps, gidPerHogAmmo);
 
 const MAX_EVENT_STRINGS = 100;
 var trammo:  array[TAmmoStrId] of ansistring;   // name of the weapon
--- a/hedgewars/uWorld.pas	Fri Nov 05 20:08:15 2010 +0100
+++ b/hedgewars/uWorld.pas	Fri Nov 05 15:37:36 2010 -0400
@@ -133,6 +133,11 @@
 g:= AddGoal(g, gfArtillery, gidArtillery); // artillery?
 g:= AddGoal(g, gfSolidLand, gidSolidLand); // solid land?
 g:= AddGoal(g, gfSharedAmmo, gidSharedAmmo); // shared ammo?
+g:= AddGoal(g, gfResetHealth, gidResetHealth);
+g:= AddGoal(g, gfAISurvival, gidAISurvival);
+g:= AddGoal(g, gfInfAttack, gidInfAttack);
+g:= AddGoal(g, gfResetWeps, gidResetWeps);
+g:= AddGoal(g, gfPerHogAmmo, gidPerHogAmmo);
 
 // modified damage modificator?
 if cDamagePercent <> 100 then
--- a/share/hedgewars/Data/Locale/en.txt	Fri Nov 05 20:08:15 2010 +0100
+++ b/share/hedgewars/Data/Locale/en.txt	Fri Nov 05 15:37:36 2010 -0400
@@ -501,3 +501,8 @@
 05:13=Mine Timers: Mines will detonate instantly
 05:14=Mine Timers: Mines will detonate after 0 - 3 seconds
 05:15=Damage Modifier: All weapons will do %1% damage
+05:16=Health of all hogs is reset on end of turn
+05:17=AI hogs respawn on death
+05:18=Unlimited Attacks
+05:19=Weapons are reset on end of turn
+05:20=Weapons are not shared between hogs