From bc3949db1a6e81501c25cdcf398ebf9bda3cb51d Mon Sep 17 00:00:00 2001
From: Matei <matei@wildfiregames.com>
Date: Sun, 18 Sep 2005 03:16:12 +0000
Subject: [PATCH] Added a fairly primitive water plane. This includes several
 things:

- Hotkeys Q, A, Z to toggle, raise and lower the water plane
respectively.
- A unit trait, named anchor, that says whether it attaches to the
terrain or the water.
- Small changes to rendering code.

This was SVN commit r2744.
---
 binaries/data/config/system.cfg               |   5 +-
 .../official/entities/template_entity.xml     |   3 +
 .../official/entities/units/hele_ship.xml     |  13 ++-
 .../data/mods/official/gui/test/4_session.xml |  27 +++++
 .../maps/scenarios/neareastern_generated.pmp  |   2 +-
 .../maps/scenarios/neareastern_generated.xml  |   4 +-
 .../data/profiles/default/settings/history    | 100 +++++++++---------
 7 files changed, 99 insertions(+), 55 deletions(-)

diff --git a/binaries/data/config/system.cfg b/binaries/data/config/system.cfg
index 2e14648e98..1e3991024d 100644
--- a/binaries/data/config/system.cfg
+++ b/binaries/data/config/system.cfg
@@ -164,6 +164,9 @@ hotkey.contextorder.previous = RightBracket			; Cycle left through orders (conte
 hotkey.orbital.toggle = V					; Enable/disable ball arena.
 hotkey.orbital.cheat = "LeftCtrl+Backslash"			; Freeze ball.
 hotkey.dudemachine.random = "Ctrl+ForwardSlash"			; Create random Dude.
+hotkey.water.toggle = "Q"					; Toggle water rendering
+hotkey.water.raise = "A"					; Raise water plane
+hotkey.water.lower = "Z"					; Lower water plane
 
 ; > OVERLAY KEYS
 hotkey.fps.toggle = "Shift+F"					; Toggle frame counter.
@@ -203,4 +206,4 @@ hotkey.audio.toggle = "Ctrl+A"					; Enable/disable sound.
 ; shift+#							; add group # to selection
 ; ctrl+#							; save selection as group #
 ; alt+# (hold down)						; snap view to group # (while alt is held down)
-; mouse on map edge						; scroll in this direction
\ No newline at end of file
+; mouse on map edge						; scroll in this direction
diff --git a/binaries/data/mods/official/entities/template_entity.xml b/binaries/data/mods/official/entities/template_entity.xml
index 1a0bc9a6c6..702a4e09b1 100755
--- a/binaries/data/mods/official/entities/template_entity.xml
+++ b/binaries/data/mods/official/entities/template_entity.xml
@@ -28,6 +28,9 @@
 		<MiniMap
 			type="Unit"
 		/>
+		<Anchor
+			type="Ground"
+		/>
 	</Traits>
 	<Script File="entities/template_entity_script.js" />
 
diff --git a/binaries/data/mods/official/entities/units/hele_ship.xml b/binaries/data/mods/official/entities/units/hele_ship.xml
index d3ea61ffc5..d6a285ddc7 100644
--- a/binaries/data/mods/official/entities/units/hele_ship.xml
+++ b/binaries/data/mods/official/entities/units/hele_ship.xml
@@ -10,6 +10,17 @@
 			specific="Temporary Ship"
 			history="This is a 'female' temporary ship, feel free to delete/tweak this entity file at any time."
 		/>
+	
+		<Anchor
+			type="Water"
+		/>
+	
+		<Health
+			bar_height="12.0"
+		/>
 	</Traits>
+
+	<Footprint radius="5.0" height="5.0"/>
+
 	<Actor>special/ship.xml</Actor>
-</Entity>
\ No newline at end of file
+</Entity>
diff --git a/binaries/data/mods/official/gui/test/4_session.xml b/binaries/data/mods/official/gui/test/4_session.xml
index 4ea7df3aa4..d94867af4a 100644
--- a/binaries/data/mods/official/gui/test/4_session.xml
+++ b/binaries/data/mods/official/gui/test/4_session.xml
@@ -27,6 +27,33 @@
 			]]></action>
 		</object>
 
+		<!-- EMPTY OBJECT USED TO TOGGLE WATER RENDERING. -->
+		<object name="snWaterToggle"
+			hotkey="water.toggle"
+		>
+			<action on="Press"><![CDATA[		
+				toggleWater();
+			]]></action>
+		</object>
+
+		<!-- EMPTY OBJECT USED TO RAISE WATER PLANE. -->
+		<object name="snWaterRaise"
+			hotkey="water.raise"
+		>
+			<action on="Press"><![CDATA[		
+				setWaterHeight(getWaterHeight() + 0.25);
+			]]></action>
+		</object>
+
+		<!-- EMPTY OBJECT USED TO LOWER WATER PLANE. -->
+		<object name="snWaterLower"
+			hotkey="water.lower"
+		>
+			<action on="Press"><![CDATA[	
+				setWaterHeight(getWaterHeight() - 0.25);
+			]]></action>
+		</object>
+
 		<!-- GROUP: MINIMAP -->
 		<object name="snMiniMap"
 			style="snObject"
diff --git a/binaries/data/mods/official/maps/scenarios/neareastern_generated.pmp b/binaries/data/mods/official/maps/scenarios/neareastern_generated.pmp
index 3a1046e0c2..4c392a92b6 100644
--- a/binaries/data/mods/official/maps/scenarios/neareastern_generated.pmp
+++ b/binaries/data/mods/official/maps/scenarios/neareastern_generated.pmp
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aeaa6f18b1c6de1914733afa9c1942fdbbcdfd6a99d0f67d0535886225cf1d61
+oid sha256:610304164c797cea424446dd8e8d520b2baa9ac98005b7b94a983ca42bd00563
 size 433620
diff --git a/binaries/data/mods/official/maps/scenarios/neareastern_generated.xml b/binaries/data/mods/official/maps/scenarios/neareastern_generated.xml
index ee97f8e00c..a6e89b0b80 100644
--- a/binaries/data/mods/official/maps/scenarios/neareastern_generated.xml
+++ b/binaries/data/mods/official/maps/scenarios/neareastern_generated.xml
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:42b07367ddf0663d6df84021fc1053212905ef52947c3a17394b5bf0bb31775f
-size 227383
+oid sha256:c673f61f938536740d50ceb47888a486ca6262e26c946638543862a7dd0d4721
+size 239725
diff --git a/binaries/data/profiles/default/settings/history b/binaries/data/profiles/default/settings/history
index a3c358a178..7b3dce81a8 100644
--- a/binaries/data/profiles/default/settings/history
+++ b/binaries/data/profiles/default/settings/history
@@ -1,50 +1,50 @@
-?new Projectile( "props/weapon/weap_arrow_front.xml", Vector3D( this.position.x, this.position.y + 2.5, this.position.z ), target, 12, this );
-?new Projectile( "props/weapon/weap_arrow_front.xml", Vector3D( this.position.x, this.position.y + 2.5, this.position.z ), target, 12, this );
-?new Projectile( "props/weapon/weap_arrow_front.xml", Vector3D( this.position.x, this.position.y + 2.5, this.position.z ), target, 12, this );
-?target = this
-?new Projectile( "props/weapon/weap_arrow_front.xml", Vector3D( this.position.x, this.position.y + 2.5, this.position.z ), target, 12, this );
-?new Projectile( "props/weapon/weap_arrow_front.xml", Vector3D( this.position.x, this.position.y + 2.5, this.position.z ), target, 12, this );
-?new Projectile( "props/weapon/weap_arrow_front.xml", Vector3D( this.position.x, this.position.y + 2.5, this.position.z ), target, 12, this );
-?new Projectile( "props/weapon/weap_arrow_front.xml", Vector3D( this.position.x, this.position.y + 2.5, this.position.z ), target, 12, this );
-?new Projectile( "props/weapon/weap_arrow_front.xml", Vector3D( this.position.x, this.position.y + 2.5, this.position.z ), target, 12, this );
-?new Projectile( "props/weapon/weap_arrow_front.xml", Vector3D( this.position.x, this.position.y + 2.5, this.position.z ), target, 12, this );
-?new Projectile( "props/weapon/weap_arrow_front.xml", Vector3D( this.position.x, this.position.y + 2.5, this.position.z ), target, 12, this );
-?new Projectile( "props/weapon/weap_arrow_front.xml", Vector3D( this.position.x, this.position.y + 2.5, this.position.z ), target, 12, this );
-?new Projectile( "props/weapon/weap_arrow_front.xml", Vector3D( this.position.x, this.position.y + 2.5, this.position.z ), target, 12, this );
-?new Projectile( "props/weapon/weap_arrow_front.xml", Vector3D( this.position.x, this.position.y + 2.5, this.position.z ), target, 12, this );
-?new Projectile( "props/weapon/weap_arrow_front.xml", Vector3D( this.position.x, this.position.y + 2.5, this.position.z ), target, 12, this );
-?new Projectile( "props/weapon/weap_arrow_front.xml", Vector3D( this.position.x, this.position.y + 2.5, this.position.z ), target, 12, this );
-?new Projectile( "props/weapon/weap_arrow_front.xml", Vector3D( this.position.x, this.position.y + 2.5, this.position.z ), target, 12, this );
-?new Projectile( "props/weapon/weap_arrow_front.xml", Vector3D( this.position.x, this.position.y + 2.5, this.position.z ), target, 12, this );
-?new Projectile( "props/weapon/weap_arrow_front.xml", Vector3D( this.position.x, this.position.y + 2.5, this.position.z ), target, 12, this );
-?new Projectile( "props/weapon/weap_arrow_front.xml", Vector3D( this.position.x, this.position.y + 2.5, this.position.z ), target, 12, this );
-?new Projectile( "props/weapon/weap_arrow_front.xml", Vector3D( this.position.x, this.position.y + 2.5, this.position.z ), target, 12, this );
-?new Projectile( "props/weapon/weap_arrow_front.xml", Vector3D( this.position.x, this.position.y + 2.5, this.position.z ), target, 12, this );
-?new Projectile( "props/weapon/weap_arrow_front.xml", Vector3D( this.position.x, this.position.y + 2.5, this.position.z ), target, 12, this );
-?new Projectile( "props/weapon/weap_arrow_front.xml", Vector3D( this.position.x, this.position.y + 2.5, this.position.z ), target, 12, this );
-?new Projectile( "props/weapon/weap_arrow_front.xml", Vector3D( this.position.x, this.position.y + 2.5, this.position.z ), target, 12, this );
-?new Projectile( "props/weapon/weap_arrow_front.xml", Vector3D( this.position.x, this.position.y + 2.5, this.position.z ), target, 12, this );
-?target = this;
-?new Projectile( "props/weapon/weap_arrow_front.xml", Vector3D( this.position.x, this.position.y + 2.5, this.position.z ), target, 12, this );
-?new Projectile( "props/weapon/weap_arrow_front.xml", Vector3D( this.position.x, this.position.y + 2.5, this.position.z ), target, 12, this );
-?new Projectile( "props/weapon/weap_arrow_front.xml", Vector3D( this.position.x, this.position.y + 2.5, this.position.z ), target, 12, this );
-?new Projectile( "props/weapon/weap_arrow_front.xml", Vector3D( this.position.x, this.position.y + 2.5, this.position.z ), target, 12, this );
-?b
-?this.traits.health.curr
-?this.traits.health.max
-?entities.subset( function() { return( this.traits.health.cur < this.traits.health.max ); }
-?entities.subset( function() { return( this.traits.health.cur < this.traits.health.max ); } );
-?entities.subset( function() { return( this.traits.health.curr < this.traits.health.max ); } );
-?selection = entities.subset( function() { return( this.traits.health.curr < this.traits.health.max ); } );
-?1+1
-?new Entity("wrld_flora_oak", new Vector3D(1, 1, 1))
-?new Entity("wrld_flora_oak", new Vector3D(1, 3, 1))
-?new Entity("wrld_flora_oak", new Vector3D(1, 30, 1))
-?new Entity("wrld_flora_oak", new Vector3D(3, 0, 1))
-?new Entity("wrld_flora_oak", new Vector3D(8, 0, 1))
-?new Entity("wrld_flora_oak", new Vector3D(8, 0, 8))
-quit
-quit()
-exit
-exit
-1+1
+:startPlacing()
+:startPlacing("hele_tc")
+:startPlacing("hele_tc")
+:startPlacing("hele_tc")
+:startPlacing("hele_tc")
+:startPlacing("hele_tc")
+:startPlacing("hele_tc")
+:startPlacing("hele_tc")
+:startPlacing("hele_ho")
+:startPlacing("hele_ho")
+:startPlacing("hele_ho")
+:startPlacing("hele_ho")
+:startPlacing("hele_ho")
+:startPlacing("hele_ho")
+:startPlacing("hele_isp_b")
+:startPlacing("hele_isp_b")
+:startPlacing("hele_tc")
+:startPlacing("hele_tc")
+:startPlacing("hele_tc")
+:startPlacing("hele_tc")
+:startPlacing("hele_tc")
+:startPlacing("hele_tc")
+:startPlacing("hele_tc")
+:startPlacing("hele_tc")
+:startPlacing("hele_tc")
+:startPlacing("hele_ho")
+:startPlacing("hele_ho")
+:startPlacing("hele_ho")
+:startPlacing("hele_ho")
+:startPlacing("hele_ho")
+:startPlacing("hele_isp_a")
+:startPlacing("hele_isp_a")
+:startPlacing("hele_isp_a")
+:startPlacing("hele_isp_a")
+:startPlacing("hele_isp_a")
+:startPlacing("hele_isp_a")
+:startPlacing("hele_ho")
+:startPlacing("hele_ho")
+:startPlacing("hele_ho")
+:setWaterHeight(10)
+:setWaterHeight(1)
+toggleWater()
+:toggleWater()
+:toggleWater()
+:setWaterHeight(10)
+:setWaterHeight(20)
+:setWaterHeight(20)
+:setWaterHeight(5)
+:setWaterHeight(2)
+:setWaterHeight(5)