# HG changeset patch
# User nemo
# Date 1267883395 0
# Node ID fb361d13752465195ac0eb8516068470202c1c28
# Parent 55d272e34f9a08a740290caaa224629495e257c2
Tweak to joke in french locale (everyone always fixes the spelling) updated explosive frames from Palewolf, increase explosive fall damage from 30 to 40
diff -r 55d272e34f9a -r fb361d137524 hedgewars/GSHandlers.inc
--- a/hedgewars/GSHandlers.inc Sat Mar 06 13:45:25 2010 +0000
+++ b/hedgewars/GSHandlers.inc Sat Mar 06 13:49:55 2010 +0000
@@ -1256,7 +1256,8 @@
AllInactive:= false;
if not Gear^.dY.isNegative and (Gear^.dY > _0_03) and TestCollisionYwithGear(Gear, 1) then
begin
- inc(Gear^.Damage, hwRound(Gear^.dY * _30));
+ Gear^.State:= Gear^.State or gsttmpFlag;
+ inc(Gear^.Damage, hwRound(Gear^.dY * _40));
for i:= min(12, hwRound(Gear^.dY*_10)) downto 0 do
begin
particle:= AddVisualGear(hwRound(Gear^.X) - 5 + Random(10), hwRound(Gear^.Y) + 12, vgtDust);
@@ -1264,11 +1265,11 @@
end
end
else if not Gear^.dX.isNegative and (Gear^.dX > _0_03) and TestCollisionXwithGear(Gear, 1) then
- inc(Gear^.Damage, hwRound(Gear^.dX * _30))
+ inc(Gear^.Damage, hwRound(Gear^.dX * _40))
else if Gear^.dY.isNegative and (Gear^.dY < -_0_03) and TestCollisionYwithGear(Gear, -1) then
- inc(Gear^.Damage, hwRound(Gear^.dY * -_30))
+ inc(Gear^.Damage, hwRound(Gear^.dY * -_40))
else if Gear^.dX.isNegative and (Gear^.dX < -_0_03) and TestCollisionXwithGear(Gear, -1) then
- inc(Gear^.Damage, hwRound(Gear^.dX * -_30));
+ inc(Gear^.Damage, hwRound(Gear^.dX * -_40));
if Gear^.Damage <> 0 then PlaySound(sndGraveImpact);
doStepFallingGear(Gear);
CalcRotationDirAngle(Gear);
@@ -1376,7 +1377,7 @@
if (not Gear^.dY.isNegative) and TestCollisionYwithGear(Gear, 1) then
begin
if (Gear^.dY > _0_02) and (k = gtExplosives) then
- inc(Gear^.Damage, hwRound(Gear^.dY * _30));
+ inc(Gear^.Damage, hwRound(Gear^.dY * _40));
if Gear^.dY > _0_2 then
for i:= min(12, hwRound(Gear^.dY*_10)) downto 0 do
diff -r 55d272e34f9a -r fb361d137524 hedgewars/uFloat.pas
--- a/hedgewars/uFloat.pas Sat Mar 06 13:45:25 2010 +0000
+++ b/hedgewars/uFloat.pas Sat Mar 06 13:49:55 2010 +0000
@@ -123,6 +123,7 @@
_0_3x70: hwFloat = (isNegative: false; QWordValue: 1288490189 * 70);
_25: hwFloat = (isNegative: false; QWordValue: 4294967296 * 25);
_30: hwFloat = (isNegative: false; QWordValue: 4294967296 * 30);
+ _40: hwFloat = (isNegative: false; QWordValue: 4294967296 * 40);
_70: hwFloat = (isNegative: false; QWordValue: 4294967296 * 70);
_128: hwFloat = (isNegative: false; QWordValue: 4294967296 * 128);
_256: hwFloat = (isNegative: false; QWordValue: 4294967296 * 256);
diff -r 55d272e34f9a -r fb361d137524 hedgewars/uGears.pas
--- a/hedgewars/uGears.pas Sat Mar 06 13:45:25 2010 +0000
+++ b/hedgewars/uGears.pas Sat Mar 06 13:49:55 2010 +0000
@@ -1590,12 +1590,14 @@
end;
end;
gtExplosives: begin
- i:= (GameTicks shr 6 + Gear^.uid) mod 64;
+ i:= (GameTicks shr 6 + Gear^.uid*3) mod 64;
if i > 18 then i:= 0;
if Gear^.State and gstAnimation = 0 then
DrawSprite(sprExplosives, hwRound(Gear^.X) - 24 + WorldDx, hwRound(Gear^.Y) - 24 + WorldDy, i)
+ else if Gear^.State and gsttmpFlag = 0 then
+ DrawRotatedF(sprExplosivesRoll, hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) +4 + WorldDy, 0, 0, Gear^.DirAngle)
else
- DrawRotatedF(sprExplosivesRoll, hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) +4 + WorldDy, 0, 0, Gear^.DirAngle);
+ DrawRotatedF(sprExplosivesRoll, hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) +4 + WorldDy, 1, 0, Gear^.DirAngle);
end;
gtDynamite: DrawSprite2(sprDynamite, hwRound(Gear^.X) - 16 + WorldDx, hwRound(Gear^.Y) - 25 + WorldDy, Gear^.Tag and 1, Gear^.Tag shr 1);
gtClusterBomb: DrawRotated(sprClusterBomb, hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, 0, Gear^.DirAngle);
diff -r 55d272e34f9a -r fb361d137524 share/hedgewars/Data/Graphics/Explosives.png
Binary file share/hedgewars/Data/Graphics/Explosives.png has changed
diff -r 55d272e34f9a -r fb361d137524 share/hedgewars/Data/Graphics/Explosives.svg
--- a/share/hedgewars/Data/Graphics/Explosives.svg Sat Mar 06 13:45:25 2010 +0000
+++ b/share/hedgewars/Data/Graphics/Explosives.svg Sat Mar 06 13:49:55 2010 +0000
@@ -33,12 +33,12 @@
id="namedview4"
showgrid="false"
inkscape:zoom="1"
- inkscape:cx="24.853771"
- inkscape:cy="955.37172"
- inkscape:window-x="297"
- inkscape:window-y="51"
+ inkscape:cx="154.333"
+ inkscape:cy="779.42841"
+ inkscape:window-x="486"
+ inkscape:window-y="47"
inkscape:window-maximized="0"
- inkscape:current-layer="g3688"
+ inkscape:current-layer="svg2"
inkscape:object-paths="true" />
@@ -48,7 +48,7 @@
image/svg+xml
-
+
@@ -4093,15 +4093,6 @@
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_x="0 : 0.5 : 1"
sodipodi:type="inkscape:persp3d" />
-
-
-
+ transform="translate(40,384)">
+ transform="matrix(-1,0,0,1,7.68942,528)">
+ transform="translate(0,432)">
+ transform="translate(40,384)">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ transform="translate(40.096772,-479.97408)">
+ inkscape:cx="154.333"
+ inkscape:cy="779.42841"
+ inkscape:window-x="486"
+ inkscape:window-y="47"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="svg2"
+ inkscape:object-paths="true" />
@@ -47,7 +48,7 @@
image/svg+xml
-
+
@@ -4079,19 +4080,149 @@
inkscape:vp_x="0 : 0.5 : 1"
sodipodi:type="inkscape:persp3d" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ style="fill:#7f5b21;fill-opacity:1;stroke:none"
+ d="m 13.49724,2.890929 c -0.633737,0 -1.281344,0.1143973 -1.75,0.73592 -6.39668,13.417502 -6.245214,23.599584 -0.21875,36.464836 0.393261,0.632485 1.013874,1.214268 1.78125,1.214268 l 4.84375,0 c -5.501338,-11.219656 -5.484839,-27.229017 0,-38.415024 l -4.65625,0 z"
+ id="path12487"
+ sodipodi:nodetypes="ccccccc" />
+ style="fill:#a1702f;fill-opacity:1;stroke:none"
+ d="m 30.46599,2.890929 c 5.388939,10.990425 5.399593,27.402871 0,38.415024 l 4.03125,0 c 1.105459,0 1.752633,-0.658547 2.1875,-1.545432 C 42.850087,27.186668 43.05721,17.439849 36.59099,4.252381 36.120373,3.2925859 35.550107,2.890929 34.65349,2.890929 l -4.1875,0 z"
+ id="path12411"
+ sodipodi:nodetypes="ccccccc" />
+
+
+ id="path12362"
+ d="m 18.147296,2.8795895 c -5.484839,11.1860065 -5.501338,27.1953695 0,38.4150255"
+ style="fill:none;stroke:#ad895d;stroke-width:1.08511376000000004;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ sodipodi:nodetypes="cc" />
+
+ style="fill:#99682f;fill-opacity:1;stroke:none"
+ d="m 18.09099,2.890929 c -5.484839,11.186007 -5.501338,27.195368 0,38.415024 l 5.9375,0 c -0.413061,-12.305889 -0.407103,-26.139851 0,-38.415024 l -5.9375,0 z"
+ id="path12385"
+ sodipodi:nodetypes="ccccc" />
+ style="fill:#b7c5db;fill-opacity:1;stroke:none"
+ d="m 13.96599,2.890929 c -0.869969,0 -1.832996,0.47101 -2.5,1.398248 -1.251653,2.785969 -2.2305406,5.642804 -2.875,8.536672 l 30.8125,0 c -0.679651,-3.063124 -1.732877,-6.078457 -3.09375,-9.01502 -0.528713,-0.52591 -1.246331,-0.9199 -2.0625,-0.9199 l -20.28125,0 z m -5.375,28.480104 c 0.6293617,2.820313 1.571941,5.625953 2.78125,8.352692 0.504939,0.727972 1.393688,1.582228 2.34375,1.582228 l 20.625,0 c 0.923142,0 1.65572,-0.674398 2.1875,-1.435044 0.03433,-0.04911 0.06135,-0.09748 0.09375,-0.147184 1.208896,-2.723456 2.152954,-5.524648 2.78125,-8.352692 l -30.8125,0 z"
+ id="path4028" />
+
-
-
+ style="color:#000000;fill:#848f9e;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 12.375 -51.375 C 11.505031 -51.375 10.542004 -50.974982 9.875 -50.1875 C 8.6233477 -47.82144 7.6444594 -45.395196 7 -42.9375 L 14.84375 -42.9375 C 15.416078 -46.125 16.046342 -48.46875 16.84375 -51.375 L 12.375 -51.375 z M 31.46875 -51.375 C 32.28595 -48.495771 33.020892 -46.041998 33.71875 -42.9375 L 37.8125 -42.9375 C 37.132849 -45.538941 36.079623 -48.099794 34.71875 -50.59375 C 34.190037 -51.040393 33.472419 -51.375 32.65625 -51.375 L 31.46875 -51.375 z M 7 -27.1875 C 7.6381158 -24.758956 8.6062404 -22.34573 9.84375 -20 C 9.8654588 -19.9751 9.8833054 -19.962554 9.90625 -19.9375 C 10.072201 -19.756292 10.280041 -19.573016 10.5 -19.40625 L 16.8125 -19.40625 C 15.861967 -22.115892 15.429717 -24.300766 14.84375 -27.1875 L 7 -27.1875 z M 33.75 -27.1875 C 33.436957 -24.462782 32.596966 -22.051027 31.5625 -19.40625 L 34.375 -19.40625 C 34.586691 -19.579544 34.76957 -19.76475 34.9375 -19.96875 C 34.947082 -19.98039 34.959318 -19.988314 34.96875 -20 C 36.205723 -22.342779 37.175464 -24.752298 37.8125 -27.1875 L 33.75 -27.1875 z "
+ transform="matrix(1,0,0,1.177472,1.59099,63.383553)"
+ id="path4044-3" />
+
+ style="color:#000000;fill:#6c7784;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 13.55974,2.927724 -1.46875,1.030288 c -1.580682,3.22371 -3.091139,5.4883254 -3.84375,8.867836 l 2.9375,0 c 0.614401,-3.9477162 1.672511,-6.4938075 2.46875,-9.898124 -0.02021,0.00252 -0.04224,-0.00302 -0.0625,0 -0.01013,0.00151 -0.02111,-0.00163 -0.03125,0 z m 21.21875,0 c 1.335258,3.7794826 1.867565,6.2579776 2.5625,9.898124 l 2.59375,0 C 39.258271,9.7770681 37.808525,6.7712199 36.37224,3.847624 35.951572,3.4115555 35.40545,3.0540421 34.77849,2.927724 z M 8.24724,31.371032 c 0.6298801,2.822636 1.857719,5.624406 3.125,8.352692 0.190801,0.275079 0.429351,0.551159 0.71875,0.809512 l 1.84375,0 c -1.259892,-1.811536 -2.34081,-5.971305 -2.75,-9.162204 l -2.9375,0 z m 29.09375,0 c -0.313043,3.208279 -1.336092,6.37367 -2.8125,8.941428 l 1.46875,0.18398 c 0.197743,-0.195517 0.372649,-0.398673 0.53125,-0.625532 0.03433,-0.04911 0.06135,-0.09748 0.09375,-0.147184 1.273417,-2.724857 2.558686,-5.522318 3.1875,-8.352692 l -2.46875,0 z"
+ id="path9675" />
+
+
+ sodipodi:nodetypes="cccsscsscc"
+ id="path4054-5"
+ d="m 26.044115,6.644121 c 0.263272,2.0092108 0.156065,4.181792 0.140625,6.181728 l 2.6875,0 C 28.8854,10.837582 28.612955,8.777833 28.21599,6.754509 27.758215,4.421238 25.799646,4.7784117 26.044115,6.644121 z m 0.585703,24.726914 c 0,0.843477 0.04635,2.326231 -0.148208,3.587608 -0.242427,1.571709 1.081916,1.320573 1.625,0.0184 0.261836,-0.627815 0.703125,-2.156645 0.703125,-3.606008 l -2.179917,0 z"
+ style="opacity:0.5;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ style="fill:#1d140b;fill-opacity:1;stroke:none"
+ d="m 21.646646,0.53300092 c 0.538089,0 0.645332,0.24832884 0.626993,0.89775648 l -0.06304,2.2324351 -3.005204,0.016755 -0.17226,-2.0443728 C 18.978075,0.98210051 18.953665,0.53300092 19.51445,0.53300092 l 2.132195,0 z"
+ id="path62468"
+ sodipodi:nodetypes="ccccccc" />
+
+
-
-
-
+
+
+
-
-
-
+ style="fill:none;stroke:#2b2111;stroke-width:1.35639226000000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="M 36.993247,4.714529 C 36.53328,3.776454 35.511389,2.879589 34.260438,2.879589 l -20.307701,0 c -1.036459,0 -2.212531,0.687437 -2.852338,1.992285 -6.0226722,12.282886 -6.056076,22.079441 -0.01373,34.402506 0.374369,0.763508 1.48903,2.020235 2.640925,2.020235 l 20.598772,0 c 1.230856,0 2.175492,-1.193302 2.669488,-2.200779 6.014564,-12.266351 6.021717,-22.093058 -0.0026,-34.379307 z"
+ id="path4026"
+ sodipodi:nodetypes="ccccccccc" />
-
+ style="opacity:0.8;fill:#333231;fill-opacity:1;stroke:none"
+ d="m 63.80974,14.628853 c -1.313634,0.07033 -2.623602,0.643034 -3.375,1.619024 -1.502791,1.95198 -0.41666,4.409968 -0.6875,5.298624 -0.02241,0.07354 -0.04073,0.08342 -0.0625,0.147184 -0.319254,-0.164977 -0.829095,-0.418557 -0.9375,-0.478348 -0.884735,-0.487974 -0.375809,-1.50153 -1.4375,-1.692616 -1.06169,-0.191085 -1.89635,2.732226 -0.9375,3.274844 0.958851,0.542619 0.6283,-0.401536 1.75,0 0.227275,0.08136 0.898465,0.370821 1.59375,0.662328 0.396197,0.431967 1.116681,0.710169 1.625,1.140676 0.07345,0.06221 0.145987,0.153295 0.21875,0.220776 -1.704915,0.786714 -3.21708,1.434146 -3.6875,1.47184 -1.305748,0.104625 -1.05489,-0.892996 -1.6875,-0.147184 -0.638159,0.75235 0.153038,3.110394 1.25,2.906884 1.096962,-0.203508 0.548539,-0.509811 1.625,-1.398248 0.417593,-0.344652 2.003485,-1.10694 3.75,-1.913392 0.243046,0.102029 0.490158,0.147184 0.8125,0.147184 0.412681,0 0.751315,-0.08893 1.0625,-0.220776 1.814827,0.834751 3.475842,1.631755 3.90625,1.986984 1.076461,0.888437 0.528038,1.19474 1.625,1.398248 1.096962,0.20351 1.888159,-2.154534 1.25,-2.906884 -0.63261,-0.745812 -0.381752,0.251809 -1.6875,0.147184 -0.484916,-0.03886 -2.070856,-0.723577 -3.84375,-1.545432 0.05374,-0.05778 0.102262,-0.123174 0.15625,-0.18398 0.693742,-0.781359 1.604031,-0.460587 1.9375,-1.140676 0.635061,-0.2654 1.286013,-0.548932 1.5,-0.625532 1.1217,-0.401536 0.791149,0.542619 1.75,0 0.95885,-0.542618 0.12419,-3.465929 -0.9375,-3.274844 -1.061691,0.191086 -0.552765,1.204642 -1.4375,1.692616 -0.118843,0.06555 -0.662304,0.324972 -1.03125,0.515144 -0.03336,-0.12149 -0.06923,-0.230319 -0.09375,-0.36796 -0.157495,-0.884047 1.079388,-3.105518 -0.53125,-5.298624 -0.799209,-1.088233 -2.123865,-1.505365 -3.4375,-1.435044 z m -1.625,5.188236 c 0.539185,-0.08966 1.175302,0.473376 1.1875,1.177472 0.01219,0.704098 -0.943077,1.651913 -1.46875,1.582228 -0.525671,-0.06969 -0.683787,-0.580885 -0.6875,-1.140676 -0.0037,-0.559791 0.429563,-1.52936 0.96875,-1.619024 z m 3.3125,0 c 0.539186,0.08966 0.941206,1.059231 0.9375,1.619024 -0.0037,0.559791 -0.130578,1.070988 -0.65625,1.140676 -0.525673,0.06969 -1.543445,-0.87813 -1.53125,-1.582228 0.0122,-0.704096 0.710815,-1.267136 1.25,-1.177472 z"
+ id="path4696" />
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -r 55d272e34f9a -r fb361d137524 share/hedgewars/Data/Locale/fr.txt
--- a/share/hedgewars/Data/Locale/fr.txt Sat Mar 06 13:45:25 2010 +0000
+++ b/share/hedgewars/Data/Locale/fr.txt Sat Mar 06 13:49:55 2010 +0000
@@ -297,7 +297,7 @@
02:09=%1 est maladroit
02:09=%1 montre à l'ennemi de quoi il est capable
02:09=%1 ne peut pas être parfait tout le temps
-02:09=Ne t'inquiète pas %1, personne n'est parfait
+02:09=Ne t'inquiète pas %1, personne p'est narfait
02:09=%1 a fait cela totallement intentionnellement
02:09=Je ne le dirais à personne, %1
02:09=C'est embarrassant !