mail[Wesnoth-commits] r20386 - in /trunk/data/campaigns/Under_the_Burning_Suns: images/units/undead/ scenarios/ units/ utils/


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by ravanrooke on September 15, 2007 - 12:12:
Author: rhuvaen
Date: Sat Sep 15 12:11:50 2007
New Revision: 20386

URL: http://svn.gna.org/viewcvs/wesnoth?rev=20386&view=rev
Log:
1. Removed the unit Necromancer2 and replaced it with the standard 
Necromancer.
2. Fixed the campfires in A Stirring in the Night (removed the item image, 
adjusted the animation speed, changed the halo)

Removed:
    
trunk/data/campaigns/Under_the_Burning_Suns/images/units/undead/sorcerer2-defence.png
    
trunk/data/campaigns/Under_the_Burning_Suns/images/units/undead/sorcerer2-ranged1.png
    
trunk/data/campaigns/Under_the_Burning_Suns/images/units/undead/sorcerer2-ranged2.png
    
trunk/data/campaigns/Under_the_Burning_Suns/images/units/undead/sorcerer2-staff1.png
    
trunk/data/campaigns/Under_the_Burning_Suns/images/units/undead/sorcerer2-staff2.png
    
trunk/data/campaigns/Under_the_Burning_Suns/images/units/undead/sorcerer2.png
    trunk/data/campaigns/Under_the_Burning_Suns/units/Necromancer2.cfg
Modified:
    trunk/data/campaigns/Under_the_Burning_Suns/scenarios/02_Harsh_Sands.cfg
    trunk/data/campaigns/Under_the_Burning_Suns/scenarios/03_Long_Night.cfg
    trunk/data/campaigns/Under_the_Burning_Suns/scenarios/09_Water.cfg
    trunk/data/campaigns/Under_the_Burning_Suns/utils/terrain.cfg

Removed: 
trunk/data/campaigns/Under_the_Burning_Suns/images/units/undead/sorcerer2-defence.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/images/units/undead/sorcerer2-defence.png?rev=20385&view=auto
==============================================================================
Binary file - no diff available.

Removed: 
trunk/data/campaigns/Under_the_Burning_Suns/images/units/undead/sorcerer2-ranged1.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/images/units/undead/sorcerer2-ranged1.png?rev=20385&view=auto
==============================================================================
Binary file - no diff available.

Removed: 
trunk/data/campaigns/Under_the_Burning_Suns/images/units/undead/sorcerer2-ranged2.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/images/units/undead/sorcerer2-ranged2.png?rev=20385&view=auto
==============================================================================
Binary file - no diff available.

Removed: 
trunk/data/campaigns/Under_the_Burning_Suns/images/units/undead/sorcerer2-staff1.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/images/units/undead/sorcerer2-staff1.png?rev=20385&view=auto
==============================================================================
Binary file - no diff available.

Removed: 
trunk/data/campaigns/Under_the_Burning_Suns/images/units/undead/sorcerer2-staff2.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/images/units/undead/sorcerer2-staff2.png?rev=20385&view=auto
==============================================================================
Binary file - no diff available.

Removed: 
trunk/data/campaigns/Under_the_Burning_Suns/images/units/undead/sorcerer2.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/images/units/undead/sorcerer2.png?rev=20385&view=auto
==============================================================================
Binary file - no diff available.

Modified: 
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/02_Harsh_Sands.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/scenarios/02_Harsh_Sands.cfg?rev=20386&r1=20385&r2=20386&view=diff
==============================================================================
--- trunk/data/campaigns/Under_the_Burning_Suns/scenarios/02_Harsh_Sands.cfg 
(original)
+++ trunk/data/campaigns/Under_the_Burning_Suns/scenarios/02_Harsh_Sands.cfg 
Sat Sep 15 12:11:50 2007
@@ -1778,6 +1778,9 @@
 
 # macro for all hydration effects to all units stored in
 # a variable called "affected_unit"
+# EFFECT > 0 is dehydration
+# EFFECT = 0 is silent rehydration
+# EFFECT < 0 is rehydration with notification
 
 #define APPLY_HYDRATION_EFFECT EFFECT
 {VARIABLE effect {EFFECT}}
@@ -1919,12 +1922,27 @@
       [/unstore_unit]
     [/then]
     [else]
-      [unstore_unit]
-        variable=affected_unit[$i]
-        find_vacant=no
-        red,green,blue=$red,$green,$blue
-        text= _ "refreshed"
-      [/unstore_unit]    
+      [if]
+        [variable]
+          name=effect
+          not_equals=0
+        [/variable]
+        [then]
+          [unstore_unit]
+            variable=affected_unit[$i]
+            find_vacant=no
+            red,green,blue=$red,$green,$blue
+            text= _ "refreshed"
+          [/unstore_unit]
+        [/then]
+        [else]
+          # silent unstore
+          [unstore_unit]
+            variable=affected_unit[$i]
+            find_vacant=no
+          [/unstore_unit]
+        [/else]
+      [/if]
     [/else]
   [/if]
 {NEXT i}
@@ -2102,7 +2120,17 @@
             y=1-74
           [/filter]
         [/store_unit]
-        {APPLY_HYDRATION_EFFECT -1}
+        # silent rehydration
+        {APPLY_HYDRATION_EFFECT 0}
+        {FOREACH affected_unit i}
+          {CLEAR_VARIABLE affected_unit[$i].variables.full_hitpoints}
+          {CLEAR_VARIABLE affected_unit[$i].variables.max_hitpoints}
+          {CLEAR_VARIABLE affected_unit[$i].variables.dehydration}
+          [unstore_unit]
+            find_vacant=no
+            variable=affected_unit[$i]
+          [/unstore_unit]
+        {NEXT i}
 
         [if]
             [have_unit]

Modified: 
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/03_Long_Night.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/scenarios/03_Long_Night.cfg?rev=20386&r1=20385&r2=20386&view=diff
==============================================================================
--- trunk/data/campaigns/Under_the_Burning_Suns/scenarios/03_Long_Night.cfg 
(original)
+++ trunk/data/campaigns/Under_the_Burning_Suns/scenarios/03_Long_Night.cfg 
Sat Sep 15 12:11:50 2007
@@ -817,22 +817,19 @@
         [item]
             x=14
             y=10
-            image=scenery/fire1.png
-            halo=halo/lighthouse-aura.png
+            halo=halo/fire-aura.png
         [/item]
 
         [item]
             x=16
             y=15
-            image=scenery/fire1.png
-            halo=halo/lighthouse-aura.png
+            halo=halo/fire-aura.png
         [/item]
 
         [item]
             x=13
             y=20
-            image=scenery/fire1.png
-            halo=halo/lighthouse-aura.png
+            halo=halo/fire-aura.png
         [/item]
 
         [set_variable]
@@ -1844,24 +1841,4 @@
 
     {@campaigns/Under_the_Burning_Suns/utils/global-events.cfg}
     
-    # let's add some campfire animation, and use the campfire terrain
-    [terrain_graphics]
-        map="
-   1
- 1   1
-   2
- 1   1
-   1"
-     [tile]
-       pos=1
-       type=Dd,Hd
-     [/tile]
-     [tile]
-       pos=2
-       type=Dd^Fi
-       [image]
-         
name=../scenery/fire2:140,../scenery/fire3:150,../scenery/fire4:110,../scenery/fire1:90
-       [/image]
-     [/tile]
-    [/terrain_graphics]
 [/scenario]

Modified: trunk/data/campaigns/Under_the_Burning_Suns/scenarios/09_Water.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/scenarios/09_Water.cfg?rev=20386&r1=20385&r2=20386&view=diff
==============================================================================
--- trunk/data/campaigns/Under_the_Burning_Suns/scenarios/09_Water.cfg 
(original)
+++ trunk/data/campaigns/Under_the_Burning_Suns/scenarios/09_Water.cfg Sat 
Sep 15 12:11:50 2007
@@ -1515,7 +1515,7 @@
                         side=1
                     [/remove_shroud]
 
-                    {UNIT_ (Necromancer2) (Hekuba) ( _ "Hekuba") 4 15 28}
+                    {UNIT_ (Necromancer) (Hekuba) ( _ "Hekuba") 4 15 28}
 
                     [message]
                         description=Hekuba

Removed: trunk/data/campaigns/Under_the_Burning_Suns/units/Necromancer2.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/units/Necromancer2.cfg?rev=20385&view=auto
==============================================================================
--- trunk/data/campaigns/Under_the_Burning_Suns/units/Necromancer2.cfg 
(original)
+++ trunk/data/campaigns/Under_the_Burning_Suns/units/Necromancer2.cfg 
(removed)
@@ -1,103 +1,0 @@
-#textdomain wesnoth-utbs
-[unit]
-    id=Necromancer2
-    name= _ "Necromancer"
-    race=human
-    image="units/undead/sorcerer2.png"
-    {DEFENSE_ANIM "units/undead/sorcerer2-defence.png" 
"units/undead/sorcerer2.png" {SOUND_LIST:HUMAN_OLD_HIT} }
-    hitpoints=75
-    movement_type=smallfoot
-    movement=5
-    experience=80
-    level=3
-    alignment=chaotic
-    advanceto=null
-    {AMLA_TOUGH 3}
-    cost=38
-    usage=mixed fighter
-    unit_description= _ "One of the greatest circles of what is considered 
'black magic' is the art of necromancy, the terrible ability to awaken the 
dead with false life. It was a discovery that had terrible ramifications and 
caused humanity's condemnation of black magic, for it has given fear a vast 
new arsenal.
-
-This ability, in all aspects, is the first step towards cheating death of 
its ultimate prize. It is the highest degree of power a dark mage can attain 
without losing grip on humanity itself, but pales to the lethal power wielded 
by Liches. Their mortal bodies are also made sturdier by their magic, in 
contrast to the frail decayed form of a Lich.
-
-Special Notes: the necromancer's ranged attacks are magical and always have 
a high chance of hitting an opponent. The staff of a necromancer is marked 
with the plague, and any foe struck down by it will rise again in unlife."
-    die_sound={SOUND_LIST:HUMAN_OLD_DIE}
-    [attack]
-        name=staff
-        description= _"staff"
-        type=impact
-        range=melee
-        damage=6
-        number=3
-        icon=attacks/staff-plague.png
-        [specials]
-            {WEAPON_SPECIAL_PLAGUE}
-        [/specials]
-    [/attack]
-    [attack]
-        name=chill wave
-        description= _"chill wave"
-        type=cold
-        [specials]
-            {WEAPON_SPECIAL_MAGICAL}
-        [/specials]
-        range=ranged
-        damage=15
-        number=2
-        icon=attacks/dark-missile.png
-    [/attack]
-    [attack_anim]
-        [attack_filter]
-            name=chill wave
-        [/attack_filter]
-        [missile_frame]
-            begin=-200
-            end=0
-            image="projectiles/darkmissile-n.png"
-            image_diagonal="projectiles/darkmissile-ne.png"
-        [/missile_frame]
-        [frame]
-            begin=-400
-            end=-300
-            image="units/undead/sorcerer2-ranged1.png"
-        [/frame]
-        [frame]
-            begin=-300
-            end=-200
-            image="units/undead/sorcerer2-ranged2.png"
-        [/frame]
-        [if]
-            hits=yes
-            [frame]
-                sound=magic-dark-big.ogg
-                begin=-200
-                end=0
-                image="units/undead/sorcerer2-ranged2.png"
-            [/frame]
-        [/if]
-        [else]
-            hits=no
-            [frame]
-                sound=magic-dark-big-miss.ogg
-                begin=-200
-                end=0
-                image="units/undead/sorcerer2-ranged2.png"
-            [/frame]
-        [/else]
-    [/attack_anim]
-    [attack_anim]
-        [attack_filter]
-            name=staff
-        [/attack_filter]
-        [frame]
-            begin=-100
-            end=-100
-            image="units/undead/sorcerer2-staff1.png"
-            sound=staff.wav
-        [/frame]
-        [frame]
-            begin=-100
-            end=100
-            image="units/undead/sorcerer2-staff2.png"
-        [/frame]
-    [/attack_anim]
-[/unit]

Modified: trunk/data/campaigns/Under_the_Burning_Suns/utils/terrain.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/utils/terrain.cfg?rev=20386&r1=20385&r2=20386&view=diff
==============================================================================
--- trunk/data/campaigns/Under_the_Burning_Suns/utils/terrain.cfg (original)
+++ trunk/data/campaigns/Under_the_Burning_Suns/utils/terrain.cfg Sat Sep 15 
12:11:50 2007
@@ -84,14 +84,13 @@
     symbol_image=desert
     id=DesertCampfire
     name= _ "Campfire"
-    #char=*
     string=Dd^Fi
     aliasof=Mm^Xm
     heals=false
     gives_income=false
 [/terrain]
 
-{TERRAIN_BASE Dd^Fi desert}
+{TERRAIN_OVERLAY_PROB Dd^Fi "" 100% 
../scenery/fire1:220,../scenery/fire2:220,../scenery/fire3:220,../scenery/fire4:220}
 
 
 #[terrain]




Related Messages


Powered by MHonArc, Updated Sat Sep 15 12:20:31 2007