From 7d7ae4375d9b88acb645428281e09abcddaf8117 Mon Sep 17 00:00:00 2001 From: akirschbaum Date: Sat, 5 Nov 2011 22:35:13 +0000 Subject: [PATCH] Consistently rename river archetypes. git-svn-id: svn+ssh://svn.code.sf.net/p/crossfire/code/arch/trunk@15451 282e977c-c81d-0410-88c4-b93c2d0d6712 --- CHANGES | 3 +++ river/branch_125.arc | 4 ++-- river/branch_135.arc | 2 +- river/branch_137.arc | 2 +- river/branch_145.arc | 4 ++-- river/branch_156.arc | 4 ++-- river/branch_157.arc | 2 +- river/branch_158.arc | 4 ++-- river/branch_237.arc | 4 ++-- river/branch_347.arc | 4 ++-- river/branch_357.arc | 2 +- river/branch_367.arc | 4 ++-- river/branch_378.arc | 4 ++-- river/bridge_15.arc | 2 +- river/bridge_37.arc | 2 +- river/ford_ns.arc | 2 +- river/ford_we.arc | 2 +- 17 files changed, 27 insertions(+), 24 deletions(-) diff --git a/CHANGES b/CHANGES index 2ee6055c1..6c189b295 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,9 @@ Changes for SVN top of tree: ============================================================================== +Consistently rename river archetypes. +Andreas Kirschbaum 2011-11-05 + Additional fishing pole graphic and archetype. skills/Skill_Tools/fishing_pole2.base.111.png skills/Skill_Tools/fishing_pole2.face diff --git a/river/branch_125.arc b/river/branch_125.arc index 4e88e81be..e34b7d6d3 100644 --- a/river/branch_125.arc +++ b/river/branch_125.arc @@ -1,11 +1,11 @@ -Object rcrook_ns-ne +Object river_crook_ns-ne face branch_125.111 name river junction move_block all no_pick 1 is_water 1 end -Object rjunct_ns-ne +Object river_junct_ns-ne face branch_125.211 name river junction move_block all diff --git a/river/branch_135.arc b/river/branch_135.arc index 50405b817..0d245dfab 100644 --- a/river/branch_135.arc +++ b/river/branch_135.arc @@ -1,4 +1,4 @@ -Object rjunct_ns-e +Object river_junct_ns-e face branch_135.111 name river junction move_block all diff --git a/river/branch_137.arc b/river/branch_137.arc index 8fd3028e5..90c66a144 100644 --- a/river/branch_137.arc +++ b/river/branch_137.arc @@ -1,4 +1,4 @@ -Object rjunct_we-n +Object river_junct_we-n face branch_137.111 name river junction move_block all diff --git a/river/branch_145.arc b/river/branch_145.arc index 325d50bd7..2ae0a289a 100644 --- a/river/branch_145.arc +++ b/river/branch_145.arc @@ -1,11 +1,11 @@ -Object rcrook_ns-se +Object river_crook_ns-se face branch_145.111 name river junction move_block all no_pick 1 is_water 1 end -Object rjunct_ns-se +Object river_junct_ns-se face branch_145.211 name river junction move_block all diff --git a/river/branch_156.arc b/river/branch_156.arc index 0bc378a77..64a3a0670 100644 --- a/river/branch_156.arc +++ b/river/branch_156.arc @@ -1,11 +1,11 @@ -Object rcrook_ns-sw +Object river_crook_ns-sw face branch_156.111 name river junction move_block all no_pick 1 is_water 1 end -Object rjunct_ns-sw +Object river_junct_ns-sw face branch_156.211 name river junction move_block all diff --git a/river/branch_157.arc b/river/branch_157.arc index 17585ef95..64ac488d8 100644 --- a/river/branch_157.arc +++ b/river/branch_157.arc @@ -1,4 +1,4 @@ -Object rjunct_ns-w +Object river_junct_ns-w face branch_157.111 name river junction move_block all diff --git a/river/branch_158.arc b/river/branch_158.arc index dde6d275e..aed466f6c 100644 --- a/river/branch_158.arc +++ b/river/branch_158.arc @@ -1,11 +1,11 @@ -Object rcrook_ns-nw +Object river_crook_ns-nw face branch_158.111 name river junction move_block all no_pick 1 is_water 1 end -Object rjunct_ns-nw +Object river_junct_ns-nw face branch_158.211 name river junction move_block all diff --git a/river/branch_237.arc b/river/branch_237.arc index b9d4bcd4c..692592702 100644 --- a/river/branch_237.arc +++ b/river/branch_237.arc @@ -1,11 +1,11 @@ -Object rcrook_we-ne +Object river_crook_we-ne face branch_237.111 name river junction move_block all no_pick 1 is_water 1 end -Object rjunct_we-ne +Object river_junct_we-ne face branch_237.211 name river junction move_block all diff --git a/river/branch_347.arc b/river/branch_347.arc index aa31a8eff..5ceb6a26a 100644 --- a/river/branch_347.arc +++ b/river/branch_347.arc @@ -1,11 +1,11 @@ -Object rcrook_we-se +Object river_crook_we-se face branch_347.111 name river junction move_block all no_pick 1 is_water 1 end -Object rjunct_we-se +Object river_junct_we-se face branch_347.211 name river junction move_block all diff --git a/river/branch_357.arc b/river/branch_357.arc index 3d90d3083..486c4bd3c 100644 --- a/river/branch_357.arc +++ b/river/branch_357.arc @@ -1,4 +1,4 @@ -Object rjunct_we-s +Object river_junct_we-s face branch_357.111 name river junction move_block all diff --git a/river/branch_367.arc b/river/branch_367.arc index c1b5f7d21..124a55096 100644 --- a/river/branch_367.arc +++ b/river/branch_367.arc @@ -1,11 +1,11 @@ -Object rcrook_we-sw +Object river_crook_we-sw face branch_367.111 name river junction move_block all no_pick 1 is_water 1 end -Object rjunct_we-sw +Object river_junct_we-sw face branch_367.211 name river junction move_block all diff --git a/river/branch_378.arc b/river/branch_378.arc index ba5b93c01..dcd0d4596 100644 --- a/river/branch_378.arc +++ b/river/branch_378.arc @@ -1,11 +1,11 @@ -Object rcrook_we-nw +Object river_crook_we-nw face branch_378.111 name river junction move_block all no_pick 1 is_water 1 end -Object rjunct_we-nw +Object river_junct_we-nw face branch_378.211 name river junction move_block all diff --git a/river/bridge_15.arc b/river/bridge_15.arc index 169681ffb..5b6c7d060 100644 --- a/river/bridge_15.arc +++ b/river/bridge_15.arc @@ -1,4 +1,4 @@ -Object bridge_ns +Object river_bridge_ns face bridge_15.111 name bridge no_pick 1 diff --git a/river/bridge_37.arc b/river/bridge_37.arc index ff54b5d5c..701956cdc 100644 --- a/river/bridge_37.arc +++ b/river/bridge_37.arc @@ -1,4 +1,4 @@ -Object bridge_we +Object river_bridge_we face bridge_37.111 name bridge no_pick 1 diff --git a/river/ford_ns.arc b/river/ford_ns.arc index a9ce3239c..fcb90a63e 100644 --- a/river/ford_ns.arc +++ b/river/ford_ns.arc @@ -1,4 +1,4 @@ -Object ford_ns +Object river_ford_ns face ford_ns.111 name ford no_pick 1 diff --git a/river/ford_we.arc b/river/ford_we.arc index 8937a058b..c4a55e129 100644 --- a/river/ford_we.arc +++ b/river/ford_we.arc @@ -1,4 +1,4 @@ -Object ford_we +Object river_ford_we face ford_we.111 name ford no_pick 1