From 89e2f112e5e3b8dd6eb1817b340a5295897c8580 Mon Sep 17 00:00:00 2001
From: partmedia <partmedia@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Fri, 28 Dec 2018 19:19:20 +0000
Subject: [PATCH] Rename ships

Change "big galleon" to "galleon" and "galleon" to "caravel".


git-svn-id: svn+ssh://svn.code.sf.net/p/crossfire/code/arch/trunk@20638 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 transport/biggalleon.arc          | 8 ++++----
 transport/galleon.arc             | 1 +
 transport/s_ship.arc              | 8 ++++----
 transport/sailing_big_galleon.arc | 2 +-
 transport/sailing_galleon.arc     | 2 +-
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/transport/biggalleon.arc b/transport/biggalleon.arc
index 2fbfe1ea1..81e279997 100644
--- a/transport/biggalleon.arc
+++ b/transport/biggalleon.arc
@@ -1,5 +1,5 @@
 Object big_galleon
-name big galleon
+name galleon
 type 66
 face biggalleon.x11
 no_pick 1
@@ -9,7 +9,7 @@ client_type 25012
 end
 More
 Object big_galleon_2
-name big galleon
+name galleon
 type 66
 face biggalleon.x11
 x 1
@@ -19,7 +19,7 @@ move_block boat
 end
 More
 Object big_galleon_3
-name big galleon
+name galleon
 type 66
 face biggalleon.x11
 y 1
@@ -29,7 +29,7 @@ move_block boat
 end
 More
 Object big_galleon_4
-name big galleon
+name galleon
 type 66
 face biggalleon.x11
 x 1
diff --git a/transport/galleon.arc b/transport/galleon.arc
index 8f90a57ac..6957e6686 100644
--- a/transport/galleon.arc
+++ b/transport/galleon.arc
@@ -1,4 +1,5 @@
 Object galleon
+name caravel
 face galleon.111
 type 66
 no_pick 1
diff --git a/transport/s_ship.arc b/transport/s_ship.arc
index 799b5b340..525e1f5bc 100644
--- a/transport/s_ship.arc
+++ b/transport/s_ship.arc
@@ -1,5 +1,5 @@
 Object s_ship
-name Ship
+name galleon
 type 66
 face s_ship.x11
 no_pick 1
@@ -9,7 +9,7 @@ client_type 25012
 end
 More
 Object s_ship2
-name big galleon
+name galleon
 type 66
 face s_ship.x11
 x 1
@@ -19,7 +19,7 @@ move_block boat
 end
 More
 Object s_ship3
-name big galleon
+name galleon
 type 66
 face s_ship.x11
 y 1
@@ -29,7 +29,7 @@ move_block boat
 end
 More
 Object s_ship4
-name big galleon
+name galleon
 type 66
 face s_ship.x11
 x 1
diff --git a/transport/sailing_big_galleon.arc b/transport/sailing_big_galleon.arc
index 13ebaaa44..0fc2faf6c 100644
--- a/transport/sailing_big_galleon.arc
+++ b/transport/sailing_big_galleon.arc
@@ -1,5 +1,5 @@
 Object sailing_big_galleon
-name sailing big galleon
+name sailing galleon
 speed 0.5
 type 2
 container 10000000
diff --git a/transport/sailing_galleon.arc b/transport/sailing_galleon.arc
index 538e1baff..fc55ea3a1 100644
--- a/transport/sailing_galleon.arc
+++ b/transport/sailing_galleon.arc
@@ -1,5 +1,5 @@
 Object sailing_galleon
-name sailing galleon
+name sailing caravel
 speed 0.5
 type 2
 container 10000000