diff --git a/docs/Inbox.pod b/docs/Inbox.pod index dc0c28f9..2ec8be94 100644 --- a/docs/Inbox.pod +++ b/docs/Inbox.pod @@ -205,4 +205,166 @@ A message id. If this message is in reply to another message, then set this opti A message id. If this is set, then the attachments of the message id specified will be sent along with the new message.The text of the message will not automatically be forwarded, if that is desired, it is the client's responsibility to include it in the body of the new message. + + +=head1 Message Formatting + +The messages generated by the system have built in formatting commands to aid the user in figuring things out. These are items like displaying icons for UI consistency. Bolding important items, etc. + + +=head2 Commands + +These commands should be supported by all inbox clients. The commands are as follows. + +=head3 Bold + +Bolds a segment of text by wrapping the text in asterisks. + + *bold* + +Example Perl based regular expression for formatting it as HTML. + + s/\*(\w.*?\w)\*/$1<\/b>/xsg + + +=head3 Food Icon + +Represents an in game food resource icon. + + {food} + +Example Perl based regular expression for formatting it as HTML. + + s/\{food\}//xsg + + +=head3 Water Icon + +Represents an in game water resource icon. + + {water} + +Example Perl based regular expression for formatting it as HTML. + + s/\{water\}//xsg + + +=head3 Ore Icon + +Represents an in game ore resource icon. + + {ore} + +Example Perl based regular expression for formatting it as HTML. + + s/\{ore\}//xsg + + + +=head3 Energy Icon + +Represents an in game energy resource icon. + + {energy} + +Example Perl based regular expression for formatting it as HTML. + + s/\{energy\}//xsg + + + +=head3 Waste Icon + +Represents an in game waste resource icon. + + {waste} + +Example Perl based regular expression for formatting it as HTML. + + s/\{waste\}//xsg + + +=head3 Happiness Icon + +Represents an in game food resource icon. + + {happiness} + +Example Perl based regular expression for formatting it as HTML. + + s/\{happiness\}//xsg + + +=head3 Time Icon + +Represents an in game time icon that shows how long something will take. + + {time} + +Example Perl based regular expression for formatting it as HTML. + + s/\{time\}//xsg + + + +=head3 Build Icon + +Represents an the in game build (tractor) icon. + + {build} + +Example Perl based regular expression for formatting it as HTML. + + s/\{build\}//xsg + + +=head3 Essentia Icon + +Represents an in game Essentia icon. + + {essentia} + +Example Perl based regular expression for formatting it as HTML. + + s/\{essentia\}//xsg + + +=head3 Plots Icon + +Represents an in game plots icon. + + {plots} + +Example Perl based regular expression for formatting it as HTML. + + s/\{plots\}//xsg + + +=head3 URLs and Links + +URLs are formatted using brackets rather than braces to make them stand out from all the other macros for icons and whatnot. + + [http://www.lacunaexpanse.com] + +Example Perl based regular expression for formatting it as HTML. + + s/\[((?:http|https):[a-z0-9\.\/\-\_]+)\]/$1<\/a>/xisg + +B It's very important that you exclude as many characters as possible from the URL so that there is less of a chance of a malicious attack from the formatted version. Therefore the link should only allow for C. It should not accept C<% ? & :> or other funky formatting that could be used against the user. If it encounters that, it should ignore it rather than formatting it. In addition it should start with http:// or https://. All other protocols should be ignored. + + +=head3 Empire Profile Link + +The empire profile link is used by automated messages in the system to link users to the profile of an empire wherever that empire is mentioned in the text. + + {Empire 999 United Federation} + + {Empire id name} + +Example Perl based regular expression for formatting it as HTML. + + s/\{Empire\s(\d+)\s(.*?)\}/$2<\/a>/xisg + +B The link generated by this is of course bogus. It is only used as an example, your application would have to create whatever it needs to display the empire's profile which displayed the data from L. + =cut \ No newline at end of file diff --git a/lib/Lacuna/DB/Result/Empire.pm b/lib/Lacuna/DB/Result/Empire.pm index ec1972e9..d70196b6 100644 --- a/lib/Lacuna/DB/Result/Empire.pm +++ b/lib/Lacuna/DB/Result/Empire.pm @@ -451,7 +451,7 @@ sub add_probe { filename => 'probe_detected.txt', tags => ['Alert'], from => $that_empire, - params => [$star_name, $self->name], + params => [$star_name, $self->id, $self->name], ); } diff --git a/lib/Lacuna/DB/Result/Ships.pm b/lib/Lacuna/DB/Result/Ships.pm index 1740d586..9f8b732c 100644 --- a/lib/Lacuna/DB/Result/Ships.pm +++ b/lib/Lacuna/DB/Result/Ships.pm @@ -269,7 +269,7 @@ sub trigger_defense { $body_attacked->empire->send_predefined_message( tags => ['Alert'], filename => 'we_shot_down_a_ship.txt', - params => [$self->type_formatted, $body_attacked->name, $self->body->empire->name], + params => [$self->type_formatted, $body_attacked->name, $self->body->empire_id, $self->body->empire->name], ); $body_attacked->add_news(20, sprintf('An amateur astronomer witnessed an explosion in the sky today over %s.',$body_attacked->name)); $self->delete; diff --git a/lib/Lacuna/DB/Result/Ships/Detonator.pm b/lib/Lacuna/DB/Result/Ships/Detonator.pm index dd7eb049..7336c3c5 100644 --- a/lib/Lacuna/DB/Result/Ships/Detonator.pm +++ b/lib/Lacuna/DB/Result/Ships/Detonator.pm @@ -25,7 +25,7 @@ sub arrive { $probe->empire->send_predefined_message( tags => ['Alert'], filename => 'probe_detonated.txt', - params => [$self->foreign_star->name, $self->body->empire->name], + params => [$self->foreign_star->name, $self->body->empire_id, $self->body->empire->name], ); $count++; } diff --git a/lib/Lacuna/DB/Result/Ships/Scanner.pm b/lib/Lacuna/DB/Result/Ships/Scanner.pm index 119d678b..25795c05 100644 --- a/lib/Lacuna/DB/Result/Ships/Scanner.pm +++ b/lib/Lacuna/DB/Result/Ships/Scanner.pm @@ -43,7 +43,7 @@ sub arrive { $body_attacked->empire->send_predefined_message( tags => ['Alert'], filename => 'we_were_scanned.txt', - params => [$body_attacked->name, $self->body->empire->name], + params => [$body_attacked->name, $self->body->empire_id, $self->body->empire->name], ); $body_attacked->add_news(65, sprintf('Several people reported seeing a UFO in the %s sky today.', $body_attacked->name)); $self->delete; diff --git a/lib/Lacuna/DB/Result/Ships/Scow.pm b/lib/Lacuna/DB/Result/Ships/Scow.pm index 19b4b959..ed4fa39c 100644 --- a/lib/Lacuna/DB/Result/Ships/Scow.pm +++ b/lib/Lacuna/DB/Result/Ships/Scow.pm @@ -32,7 +32,7 @@ sub arrive { $body_attacked->empire->send_predefined_message( tags => ['Alert'], filename => 'hit_by_scow.txt', - params => [$self->body->empire->name, $body_attacked->name, $self->hold_size], + params => [$self->body->empire_id, $self->body->empire->name, $body_attacked->name, $self->hold_size], ); $body_attacked->add_news(30, sprintf('%s is so polluted that waste seems to be falling from the sky.', $body_attacked->name)); $self->delete; diff --git a/lib/Lacuna/RPC/Building/Intelligence.pm b/lib/Lacuna/RPC/Building/Intelligence.pm index 0dfee363..2f94a846 100644 --- a/lib/Lacuna/RPC/Building/Intelligence.pm +++ b/lib/Lacuna/RPC/Building/Intelligence.pm @@ -78,12 +78,12 @@ sub burn_spy { $empire->send_predefined_message( tags => ['Alert'], filename => 'you_cant_burn_me.txt', - params => [$spy->empire->name, $spy->name], + params => [$spy->empire_id, $spy->empire->name, $spy->name], ); $spy->empire->send_predefined_message( tags => ['Alert'], filename => 'id_like_to_join_you.txt', - params => [$empire->name, $spy->name], + params => [$empire->id, $empire->name, $spy->name], ); } else { diff --git a/lib/Lacuna/Web/Admin.pm b/lib/Lacuna/Web/Admin.pm index 28d05be7..b6c199c8 100644 --- a/lib/Lacuna/Web/Admin.pm +++ b/lib/Lacuna/Web/Admin.pm @@ -23,7 +23,11 @@ sub www_send_test_message { $empire->send_message( from => $empire, - body => 'This is a test message that contains all the components possible in a message.', + body => 'This is a test message that contains all the components possible in a message. + {food} {water} {ore} {energy} {waste} {happiness} {essentia} {build} {time} + {Empire 1 Lacuna Expanse Corp} + [http://www.lacunaexpanse.com] + ', subject => 'Test Message', tags => ['Alert'], attachments => { diff --git a/var/messages/hit_by_scow.txt b/var/messages/hit_by_scow.txt index 48a40b78..76afad7f 100644 --- a/var/messages/hit_by_scow.txt +++ b/var/messages/hit_by_scow.txt @@ -1,6 +1,6 @@ Bombarded With Waste ~~~ -I can't tell if %s doesn't like us, or if they love us. They just crash landed a Scow on %s, spilling %s waste in the process. If we clean this up quickly, it's an easy source of resources, but if they dump faster than we can handle, then we could be in trouble. +I can't tell if {Empire %s %s} doesn't like us, or if they love us. They just crash landed a Scow on %s, spilling %s waste in the process. If we clean this up quickly, it's an easy source of resources, but if they dump faster than we can handle, then we could be in trouble. Regards, diff --git a/var/messages/id_like_to_join_you.txt b/var/messages/id_like_to_join_you.txt index 71733cf2..f22fe9c2 100644 --- a/var/messages/id_like_to_join_you.txt +++ b/var/messages/id_like_to_join_you.txt @@ -1,6 +1,6 @@ I'm Yours To Command ~~~ -I'm fed up with %s. I'd like to be on a winning team. I'm yours to command if you'll have me. +I'm fed up with {Empire %s %s}. I'd like to be on a winning team. I'm yours to command if you'll have me. Regards, diff --git a/var/messages/probe_detected.txt b/var/messages/probe_detected.txt index e3ed345a..6cf96a60 100644 --- a/var/messages/probe_detected.txt +++ b/var/messages/probe_detected.txt @@ -1,6 +1,6 @@ Probe Detected! ~~~ -Our probe in the %s system just detected an incoming probe. It's markings indicate it's from %s. +Our probe in the %s system just detected an incoming probe. It's markings indicate it's from {Empire %s %s}. Regards, diff --git a/var/messages/probe_detonated.txt b/var/messages/probe_detonated.txt index 048c721d..c1e5a4cf 100644 --- a/var/messages/probe_detonated.txt +++ b/var/messages/probe_detonated.txt @@ -1,6 +1,6 @@ Probe Destroyed ~~~ -We just lost contact with our probe in the %s system. Just before it went dark, our probe transmitted an image of an incoming ship. We've determined it was a Detonator sent by %s. We must assume the probe has been destroyed. +We just lost contact with our probe in the %s system. Just before it went dark, our probe transmitted an image of an incoming ship. We've determined it was a Detonator sent by {Empire %s %s}. We must assume the probe has been destroyed. Regards, diff --git a/var/messages/tutorial/drinking_water.txt b/var/messages/tutorial/drinking_water.txt index b9797483..2f4cac54 100644 --- a/var/messages/tutorial/drinking_water.txt +++ b/var/messages/tutorial/drinking_water.txt @@ -4,7 +4,7 @@ Excellent. As I mentioned before resources are going to be the key to your survi We will talk more about resource storage soon, but for now we should use some of your resources to build infrastructure. -I see that your planet has a good supply of about %s%% fresh water. Build a Water Purification Plant. It will produce the water needed to keep your empire on the upward trend and give your citizens something to drink with all that delicious Malcud Fungus from your new farm. +I see that your planet has a good supply of about %s%% fresh water. Build a Water Purification Plant. It will produce the water {water} needed to keep your empire on the upward trend and give your citizens something to drink with all that delicious Malcud Fungus from your new farm. Feel free to build anything else you think you might need. For now don't worry too much about depleting your resources. We will ensure you have everything you need as you need it. diff --git a/var/messages/tutorial/energy.txt b/var/messages/tutorial/energy.txt index ffbaf4d7..de359e11 100644 --- a/var/messages/tutorial/energy.txt +++ b/var/messages/tutorial/energy.txt @@ -1,6 +1,6 @@ Need More Power ~~~ -Well done. I'm sure you'll appreciate the free expansion I've given so you can upgrade your Food Reserve to store all the extra food you're producing. You should do the same for your energy output. Upgrade it so that you're producing %s per hour. +Well done. I'm sure you'll appreciate the free expansion I've given so you can upgrade your Food Reserve to store all the extra food you're producing. You should do the same for your energy {energy} output. Upgrade it so that you're producing %s per hour. Regards, diff --git a/var/messages/tutorial/essentia.txt b/var/messages/tutorial/essentia.txt index 70eb3b74..bf910674 100644 --- a/var/messages/tutorial/essentia.txt +++ b/var/messages/tutorial/essentia.txt @@ -4,7 +4,7 @@ You may remember I told you that the entire Lacunan economy depends upon Essenti Essentia is both rare and powerful. Our entire race spends their waking hours trying to acquire more. If you have it, you're the most powerful species in the Expanse. Essentia has rare properties that allow plants to grow more hearty and machinery to work more efficiently. It can even be used in various chemical processes to transform one element into another. It's the closest thing I've seen to magic. -Spend some of the Essentia I've given you to boost your production of water, energy, food, and ore. +Spend some of the Essentia {essentia} I've given you to boost your production of water, energy, food, and ore. Click or tap on the {essentia} icon in your user interface and then click or tap on the *boost* button. Regards, diff --git a/var/messages/tutorial/fool.txt b/var/messages/tutorial/fool.txt index b5f271ea..79d198e5 100644 --- a/var/messages/tutorial/fool.txt +++ b/var/messages/tutorial/fool.txt @@ -2,11 +2,11 @@ Don't Be So Naive ~~~ You are a trusting fool. You realize you've climbed into bed with Tralk's Demon by doing things for and taking gifts from Tou Re Ell? His one allegience is to Lacuna Expanse Corp, not you. You don't know me and I'm going to keep it that way, but I've been monitoring your progress as well. Tou Re Ell really needs to change his password once in a while, but I digress. -If you're ever going to stand up against Lacuna Expanse Corp you'll need some help from someone other than them. You realize what they're after, right? They've told you why they keep giving you all these gifts? I didn't think so! They want the rare mineral called Essentia. Our entire economy, our empire, relies on it to survive. Tou Re Ell figures the little bit of time and energy he spends with you now means you'll sell him all the Essentia you happen upon. Or worse yet, you'll do all the exploring and then he'll just swoop in and take it from you when you discover a nice deposit. +If you're ever going to stand up against Lacuna Expanse Corp you'll need some help from someone other than them. You realize what they're after, right? They've told you why they keep giving you all these gifts? I didn't think so! They want the rare mineral called Essentia {essentia}. Our entire economy, our empire, relies on it to survive. Tou Re Ell figures the little bit of time and energy he spends with you now means you'll sell him all the Essentia you happen upon. Or worse yet, you'll do all the exploring and then he'll just swoop in and take it from you when you discover a nice deposit. -You've got a nice start to your infrastructure, but you really need to start building it up a bit. Without a steady production of your basic resources your empire's growth will slow to a crawl. Build up your food income so that it's at least %s per hour. One way you can do this is to build more farms. However, now that you have a University you could also upgrade your existing farms. To upgrade a building click or tap on the building, and then click or tap on the upgrade button. +You've got a nice start to your infrastructure, but you really need to start building it up a bit. Without a steady production of your basic resources your empire's growth will slow to a crawl. Build up your food {food} income so that it's at least %s per hour. One way you can do this is to build more farms. However, now that you have a University you could also upgrade your existing farms. To upgrade a building click or tap on the building, and then click or tap on the *upgrade* button. -I'm not against "gifts" to forward my cause, and it certainly appears you're not against receiving them to forward your empire, so I'll have a present waiting for you *if* you can complete this task. +I'm not against gifts to forward my cause, and it certainly appears you're not against receiving them to forward your empire, so I'll have a present waiting for you *if* you can complete this task. Regards, diff --git a/var/messages/tutorial/get_food.txt b/var/messages/tutorial/get_food.txt index c7b07824..3c906e68 100644 --- a/var/messages/tutorial/get_food.txt +++ b/var/messages/tutorial/get_food.txt @@ -6,7 +6,7 @@ Resources are the key to expanding your empire. Without them, your species will As a token of our lasting friendship, Lacuna Expanse Corp has sent emissaries to your world to build a free Malcud Fungus Farm for your people. This particular source of food is one of our favorites as it is cheap to build and does not promote waste. Don't worry if you already have one of these, you can always benefit from more of them. -To build, click or tap the [build] icon in an empty space on your planet surface map. Then choose the Malcud Fungus Farm from the available list. +To build, click or tap the build icon {build} in an empty space on your planet surface map. Then choose the Malcud Fungus Farm from the available list. Regards, diff --git a/var/messages/tutorial/keep_the_lights_on.txt b/var/messages/tutorial/keep_the_lights_on.txt index 7b9662d7..766c4065 100644 --- a/var/messages/tutorial/keep_the_lights_on.txt +++ b/var/messages/tutorial/keep_the_lights_on.txt @@ -1,10 +1,10 @@ Keep The Lights On ~~~ -You're doing well. I'm sure that due to your curious nature you've already been clicking or tapping around the interface. If you haven't, you should do so. While you're on the planet map you can click or tap on any building. The first thing that you'll see is about the Production of that building. If it has a positive number, that means it's producing extra resources for you every hour, even when you're not logged in. If it's a negative number then it means it is burning resources every hour even when you're not logged in. +You're doing well. I'm sure that due to your curious nature you've already been clicking or tapping around the interface. If you haven't, you should do so. While you're on the planet map you can click or tap on any building. The first thing that you'll see is about the Production of that building. If it has a positive number, that means it's producing extra resources for you every hour, even when you're not logged in. If it's a negative number then it means it is burning resources every hour even when you're not logged in. The time {time} icon tells you how long it will take to build or upgrade the building. -Next we need to make sure we can "keep the lights on". I've sent some resources to you so you can build a Geo Energy Plant. This will provide you with the energy needed to power your economy. There are several types of energy plants that will be available to you as your knowledge grows. Each type has drawbacks and benefits, but for a fledgling empire like yours, it's good just to get the juice moving. +Next we need to make sure we can keep the lights on. I've sent some resources to you so you can build a Geo Energy Plant. This will provide you with the energy {energy} needed to power your economy. There are several types of energy plants that will be available to you as your knowledge grows. Each type has drawbacks and benefits, but for a fledgling empire like yours, it's good just to get the juice moving. -Don't worry if you've already built one. You can always use more power. +Don't worry if you've already built one. You can always use more energy. Regards, diff --git a/var/messages/tutorial/mine.txt b/var/messages/tutorial/mine.txt index 3e8db18e..b04497e8 100644 --- a/var/messages/tutorial/mine.txt +++ b/var/messages/tutorial/mine.txt @@ -1,10 +1,10 @@ Mines ~~~ -While you are busy collecting food and power let's talk a little bit about waste. As your planet grows, it will produce waste which must be stored. If you exceed your available waste storage it will adversely affect the happiness of your citizens which is important if you wish to keep expanding your empire. +While you are busy collecting food {food} and energy {energy} let's talk a little bit about waste {waste}. As your planet grows, it will produce waste which must be stored. If you exceed your available waste storage it will adversely affect the happiness of your citizens which is important if you wish to keep expanding your empire. -As long as your empire remains limited to this planet your citizens will never be unhappy. Once you start reaching to the stars you will have to closely monitor your waste production as well as the happiness of your citizens. There are many ways to balance these. I will leave it to you to figure out how, but don't worry about that for now. +As long as your empire remains limited to this planet your citizens will never be unhappy. Once you start reaching to the stars you will have to closely monitor your waste production as well as the happiness {happiness} of your citizens. There are many ways to balance these. I will leave it to you to figure out how, but don't worry about that for now. -Now we need to get you gathering some of the precious minerals on your planet. Once that's completed you'll be harvesting all the main resources you need to expand your empire to the farthest reaches of the Expanse. Build yourself a Mine so that you can begin harvesting the ore that this planet has to offer. +Now we need to get you gathering some of the precious ore {ore} on your planet. Once that's completed you'll be harvesting all the main resources you need to expand your empire to the farthest reaches of the Expanse. Build yourself a Mine so that you can begin harvesting the ore that this planet has to offer. Regards, diff --git a/var/messages/tutorial/more_resources.txt b/var/messages/tutorial/more_resources.txt index d398f774..c1f8114e 100644 --- a/var/messages/tutorial/more_resources.txt +++ b/var/messages/tutorial/more_resources.txt @@ -2,7 +2,7 @@ More Resources ~~~ You're doing well, but we're going to need a lot more resource production than that in order to make you an economic powerhouse. If you look at the Planet details in your Planetary Command Center you can see the total production of your planet. Depending on the user interface you use to manage your empire there will be several other ways to see this. For example, in the web client you can see it at the bottom of your screen. -If you can get your production to more than 100 of each resource (ore, water, food, and energy) per hour, then we'll be in a good position to do other more interesting things. Build more farms, mines, water purification plants, and energy plants to get your resource production going. +If you can get your production to more than 100 of each resource (ore {ore}, water {water}, food {food}, and energy {energy}) per hour, then we'll be in a good position to do other more interesting things. Build more farms, mines, water purification plants, and energy plants to get your resource production going. If you don't like waiting for a building to complete before building the next one, you might want to build a Development Ministry. You can add one extra building to your build queue per level of the Development Ministry. diff --git a/var/messages/tutorial/shipyard.txt b/var/messages/tutorial/shipyard.txt index 98a71fdc..b341b124 100644 --- a/var/messages/tutorial/shipyard.txt +++ b/var/messages/tutorial/shipyard.txt @@ -4,7 +4,7 @@ Now that you've got the Space Port you can start on the Shipyard. Your Shipyard I've just sent some more resources to you. They should arrive by the time your Shipyard is complete. -By the way, have you been keeping tabs on the number of plots you're using to build all this stuff? Planets don't have infinite amounts of space. You can see the number of plots you have versus how many you've used in the Planet details of the Planetary Command Center. +By the way, have you been keeping tabs on the number of plots {plots} you're using to build all this stuff? Planets don't have infinite amounts of space. You can see the number of plots you have versus how many you've used in the Planet details of the Planetary Command Center. Regards, diff --git a/var/messages/tutorial/the_300.txt b/var/messages/tutorial/the_300.txt index 7b54bd34..3657ba0d 100644 --- a/var/messages/tutorial/the_300.txt +++ b/var/messages/tutorial/the_300.txt @@ -1,6 +1,6 @@ Almost There ~~~ -I've given you the necessary resources to allow you to upgrade your Energy Reserve to level 2, so you should do that right away. As you've probably guessed you'll need to upgrade your water and ore production one more time each. +I've given you the necessary resources to allow you to upgrade your Energy Reserve to level 2, so you should do that right away. As you've probably guessed you'll need to upgrade your water {water} and ore {ore} production one more time each. I'll give you the resources to upgrade your storage for both of those to level 2 as well when you're done. diff --git a/var/messages/tutorial/the_end.txt b/var/messages/tutorial/the_end.txt index 4c9b1ede..6be2f750 100644 --- a/var/messages/tutorial/the_end.txt +++ b/var/messages/tutorial/the_end.txt @@ -1,6 +1,6 @@ The End ~~~ -Unfortunately, our journey has come to an end. As our final gift, we've shipped you a Subspace Transporter. All you need to do is set it up. The Subspace Transporter allows you to transport resources instantly to anyone else that has one. Unfortunately, this process consumes a tiny amount of Essentia. It's a shame to waste it, but the speed of transport has no parallel. +Unfortunately, our journey has come to an end. As our final gift, we've shipped you a Subspace Transporter. All you need to do is set it up. The Subspace Transporter allows you to transport resources instantly to anyone else that has one. Unfortunately, this process consumes a tiny amount of Essentia {essentia}. It's a shame to waste it, but the speed of transport has no parallel. We would like very much to be your first trading partner. We have a nearly infinite amount of resources at our disposal, but very little Essentia. If you're willing to part with some Essentia when you come across it, we'll trade with you for any goods that you need. This will be our exclusive deal with you. Keep in mind all the help we've given you to get started. With this in mind, I believe, I hope, that you will consider trading with us whenever you are in need. diff --git a/var/messages/we_shot_down_a_ship.txt b/var/messages/we_shot_down_a_ship.txt index 0b2221c9..d7166291 100644 --- a/var/messages/we_shot_down_a_ship.txt +++ b/var/messages/we_shot_down_a_ship.txt @@ -1,6 +1,6 @@ Target Neutralized ~~~ -Our defensive squadron was able to shoot down a %s before it reached %s. Its markings indicate that it was from %s. +Our defensive squadron was able to shoot down a %s before it reached %s. Its markings indicate that it was from {Empire %s %s}. Regards, diff --git a/var/messages/we_were_scanned.txt b/var/messages/we_were_scanned.txt index 760cb118..b1f2dcd3 100644 --- a/var/messages/we_were_scanned.txt +++ b/var/messages/we_were_scanned.txt @@ -1,6 +1,6 @@ We've Been Scanned ~~~ -Our sensors indicate that %s has just been scanned by %s. This could be idle curiosity or an indication of a pending attack. We need to get some Drones built to stop future scans, and other types of attacks. +Our sensors indicate that %s has just been scanned by {Empire %s %s}. This could be idle curiosity or an indication of a pending attack. We need to get some Drones built to stop future scans, and other types of attacks. Regards, diff --git a/var/messages/welcome.txt b/var/messages/welcome.txt index 10d27751..a9ed01ff 100644 --- a/var/messages/welcome.txt +++ b/var/messages/welcome.txt @@ -1,6 +1,6 @@ Welcome ~~~ -Allow me to introduce myself. I am Tou Re Ell, diplomat for the Lacuna Expanse Corp. We welcome %s to The Lacuna Expanse! We are the original inhabitants of the Expanse, but we are so happy to see it growing. +Allow me to introduce myself. I am Tou Re Ell, diplomat for {Empire 1 Lacuna Expanse Corp}. We welcome %s to The Lacuna Expanse! We are the original inhabitants of the Expanse, but we are so happy to see it growing. Since you are new I'd like to offer you an arrangment to help get your empire started. In return for completing some simple tasks, I will assist you in building the necessary components to ensure your survival. diff --git a/var/messages/you_cant_burn_me.txt b/var/messages/you_cant_burn_me.txt index eb4193af..6550b63d 100644 --- a/var/messages/you_cant_burn_me.txt +++ b/var/messages/you_cant_burn_me.txt @@ -1,6 +1,6 @@ I Quit! ~~~ -You can't burn me. I quit! In fact, I'm going to do better than quit, I'm going to go offer my services to %s. +You can't burn me. I quit! In fact, I'm going to do better than quit, I'm going to go offer my services to {Empire %s %s}. Good Riddence,