Changed most references from coffee to aether.

parent 2a7a9b59
......@@ -10,7 +10,7 @@ echo "I am going to ask you a few questions, and as you answer them I will creat
sleep 1
echo "* MAKE SURE YOU HAVE WRITE PERMISSION TO mudUNIX.sh *"
sleep 1
echo "***** MAKE SURE YOU ARE EXECUTING THIS SCRIPT FROM THE MAIN COFFEEMUD DIR (not source dir)*****"
echo "***** MAKE SURE YOU ARE EXECUTING THIS SCRIPT FROM THE MAIN AETHERMUD DIR (not source dir)*****"
sleep 2
......
......@@ -27,7 +27,7 @@ Windows:
mud.bat : set JAVA_HOME, and execute this to run aethermud in windows
make.bat : set JAVA_HOME, and execute this to build aethermud in windows
build.xml : ANT build file for aethermud binaries
coffee.ico : Windows icon file for shortcuts
aether.ico : Windows icon file for shortcuts
Linux:
mudUNIX.sh : Executing aethermud. (See installation guide)
......
......@@ -185,7 +185,7 @@ I3PORT=27766
I3ROUTERS=204.209.44.3:8080:*i4
######################################################################
# CoffeeInterMud 1 Settings
# AetherInterMud 1 Settings
######################################################################
# RUNCM1SERVER is run if first value is TRUE
......
......@@ -864,7 +864,7 @@ CHARCLASSES, RACES, COMMANDS, LOCALES, AREAS, EXITS, etc&nbsp;</span>
</td>
</tr>
<tr>
<td valign="top">coffeeanthem.script<br/>
<td valign="top">aetheranthem.script<br/>
</td>
<td valign="top">Sample MOBPROG script to make a mob sing
the AetherMud anthem every day. Added to mobs the same way
......@@ -1567,8 +1567,8 @@ DBCONNECTIONS=1<br/>
</li>
<li>
<p>Create a user for the new database (user in this example
is called coffee). As root, type "mysql" into the shell. Now enter:
GRANT ALL ON aethermud.* TO coffee@localhost IDENTIFIED BY "password";
is called aether). As root, type "mysql" into the shell. Now enter:
GRANT ALL ON aethermud.* TO aether@localhost IDENTIFIED BY "password";
Enter a password for the user inside the quotes. Now type, "quit".</p>
</li>
<li>
......@@ -1582,7 +1582,7 @@ DBCONNECTIONS=1<br/>
</li>
<li>
<p>Edit the following settings in AetherMud/aethermud.ini:</p>
<pre>DBCLASS=com.mysql.jdbc.Driver<br/>DBSERVICE=jdbc:mysql://localhost/aethermud<br/>DBUSER=coffee<br/>DBPASS=password<br/>DBREUSE=TRUE<br/>DBPINGINTERVALMINS=60<br/>DBCONNECTIONS=4<br/></pre>
<pre>DBCLASS=com.mysql.jdbc.Driver<br/>DBSERVICE=jdbc:mysql://localhost/aethermud<br/>DBUSER=aether<br/>DBPASS=password<br/>DBREUSE=TRUE<br/>DBPINGINTERVALMINS=60<br/>DBCONNECTIONS=4<br/></pre>
<p>(no quotes on the password here)<br/>
Save your changes and fire up AetherMud!</p>
</li>
......
......@@ -2070,15 +2070,15 @@
<td>Manage player lists</td>
</tr>
<tr>
<td>CoffeeFilter</td>
<td>AetherFilter</td>
<td>TelnetFilter</td>
<td><code>coffeeFilter()</code></td>
<td><code>aetherFilter()</code></td>
<td>Filters/transforms
text going to and from a player.
</td>
</tr>
<tr>
<td>CoffeeLevels</td>
<td>AetherLevels</td>
<td>ExpLevelLibrary</td>
<td><code>leveler()</code></td>
<td>Leveling and
......@@ -2086,15 +2086,15 @@
</td>
</tr>
<tr>
<td>CoffeeMaker</td>
<td>AetherMaker</td>
<td>GenericBuilder</td>
<td><code>coffeeMaker()</code></td>
<td><code>aetherMaker()</code></td>
<td>Generic Mob/Item
and CoffeeXML generators.
and AetherXML generators.
</td>
</tr>
<tr>
<td>CoffeeUtensils</td>
<td>AetherUtensils</td>
<td>ProtocolsLibrary</td>
<td><code>protocol()</code></td>
<td>Special protocol
......@@ -2102,23 +2102,23 @@
</td>
</tr>
<tr>
<td>CoffeeShops</td>
<td>AetherShops</td>
<td>ShoppingLibrary</td>
<td><code>coffeeShops()</code></td>
<td><code>aetherShops()</code></td>
<td>Handles
manipulation of shop inventories.
</td>
</tr>
<tr>
<td>CoffeeTables</td>
<td>AetherTables</td>
<td>StatisticsLibrary</td>
<td><code>coffeeTables()</code></td>
<td><code>aetherTables()</code></td>
<td>Maintains player
usage stats.
</td>
</tr>
<tr>
<td>CoffeeTime</td>
<td>AetherTime</td>
<td>TimeManager</td>
<td><code>time()</code></td>
<td>Real-life
......@@ -2126,7 +2126,7 @@
</td>
</tr>
<tr>
<td>CoffeeUtensils</td>
<td>AetherUtensils</td>
<td>CMMiscUtils</td>
<td><code>utensils()</code></td>
<td>Misc stuff-- law,
......@@ -2369,9 +2369,9 @@
</thead>
<tbody>
<tr>
<td>AuctionCoffeeShop</td>
<td>AuctionAetherShop</td>
<td>A special
derivative of DefaultCoffeeShop for
derivative of DefaultAetherShop for
auctioneers
</td>
</tr>
......@@ -2438,13 +2438,13 @@
</td>
</tr>
<tr>
<td>DefaultCoffeeShop</td>
<td>DefaultAetherShop</td>
<td>Represents a
single shop store inventory.
</td>
</tr>
<tr>
<td>DefaultCoffeeTableRow</td>
<td>DefaultAetherTableRow</td>
<td>Represents a days
worth of game player usage statistics.
</td>
......@@ -3832,7 +3832,7 @@ String, String)</span>
object access
method as shown below. The <code>getShop()</code>
method returns an instance of the
com.syncleus.aethermud.game.Common.interfaces.CoffeeShop interface, which
com.syncleus.aethermud.game.Common.interfaces.AetherShop interface, which
stores inventory for the shopkeepers. In creating the shopkeepers, you
will also need to specify the type of ShopKeeper.</p>
<pre> setWhatIsSold( ShopKeeper.ONLYBASEINVENTORY );<br/><br/> Weapon sword = (Weapon)CMClass.getWeapon( "Longsword" );<br/> getShop().addStoreInventory( sword, 35, -1, this );<br/> Armor mail = (Armor)CMClass.getArmor( "FullPlate" );<br/> getShop().addStoreInventory( mail, 35, -1, this );<br/> Item waterskin = CMClass.getItem( "Waterskin" );<br/> getShop().addStoreInventory( waterskin, 35, -1, this );<br/></pre>
......
......@@ -37,7 +37,7 @@
part of AetherMud; it uses HTTP 1.1 to communicate with a web browser.
In addition to being able to serve standard HTML web pages, it also
supports a simple server-processed form of HTML called <i>CMVP</i>
(Coffee MUD Virtual Pages) - this allows the server to insert
(Aether MUD Virtual Pages) - this allows the server to insert
information into the page before sending it to the browser. This
document assumes you have some familiarty with HTTP, mime types, and
stuff like that.</p>
......
This diff is collapsed.
......@@ -1675,7 +1675,7 @@ MPQSET [QUEST] [QVARNAME] [VALUE] - set temp quest var to given value.\n\r\
BREAK -- return/break out of the current if condition or program script. \n\r\
RETURN [OPTIONAL STRING] - exits the existing script, returning the string given.\n\r\
<SCRIPT> - embed Javascript in Scriptable event. Must be closed with </SCRIPT>.\n\r\
[COMMAND] [PARMS]- any valid coffee mud command!\n\r\
[COMMAND] [PARMS]- any valid aether mud command!\n\r\
** NOTES! For those commands which have multiple parameters (specifically \
MPAT, MPFORCE, MPCAST, MPECHOAT, you must use "'" characters in order to \
group any words in the first parameter of those commands. Inside \
......
......@@ -246,7 +246,7 @@ public class Archon_Metacraft extends ArchonSkill {
}
}
} else
xml.append(CMLib.coffeeMaker().getItemsXML(items, new Hashtable<String, List<Item>>(), files, null));
xml.append(CMLib.aetherMaker().getItemsXML(items, new Hashtable<String, List<Item>>(), files, null));
mob.location().recoverPhyStats();
if (!everyFlag)
break;
......
......@@ -953,7 +953,7 @@ public class BuildingSkill extends CraftingSkill implements CraftorAbility {
final String[][] data = getRecipeData(mob);
LandTitle title = CMLib.law().getLandTitle(mob.location());
double landValue = ((title == null) ? 0 : title.getPrice()) / 100.0;
String landCurrency = CMLib.beanCounter().getCurrency(mob.location());
String landCurrency = CMLib.moneyCounter().getCurrency(mob.location());
if (("LIST").startsWith(str.toUpperCase())) {
boolean hasValueTag = false;
final String mask = CMParms.combine(commands, 1);
......@@ -978,7 +978,7 @@ public class BuildingSkill extends CraftingSkill implements CraftorAbility {
if (title == null)
buf.append(wood + "% ??\n\r");
else
buf.append(CMLib.beanCounter().nameCurrencyLong(landCurrency, landValue * wood)).append("\n\r");
buf.append(CMLib.moneyCounter().nameCurrencyLong(landCurrency, landValue * wood)).append("\n\r");
} else
buf.append("??\n\r");
} else if (material.equalsIgnoreCase("MONEY")) {
......@@ -986,7 +986,7 @@ public class BuildingSkill extends CraftingSkill implements CraftorAbility {
if (CMath.isInteger(woodStr)) {
int wood = CMath.s_int(woodStr);
wood = adjustWoodRequired(wood, mob);
buf.append(CMLib.beanCounter().nameCurrencyLong(landCurrency, wood)).append("\n\r");
buf.append(CMLib.moneyCounter().nameCurrencyLong(landCurrency, wood)).append("\n\r");
} else
buf.append("??\n\r");
} else {
......@@ -1362,8 +1362,8 @@ public class BuildingSkill extends CraftingSkill implements CraftorAbility {
idata = null;
int wood = CMath.s_int(recipe[DAT_WOOD]);
wood = adjustWoodRequired(wood, mob);
if (CMLib.beanCounter().getTotalAbsoluteValue(mob, landCurrency) < wood) {
commonTell(mob, L("You'll need @x1 to do that.", CMLib.beanCounter().nameCurrencyLong(landCurrency, wood)));
if (CMLib.moneyCounter().getTotalAbsoluteValue(mob, landCurrency) < wood) {
commonTell(mob, L("You'll need @x1 to do that.", CMLib.moneyCounter().nameCurrencyLong(landCurrency, wood)));
return false;
}
woodRequired = 0;
......@@ -1372,8 +1372,8 @@ public class BuildingSkill extends CraftingSkill implements CraftorAbility {
int wood = CMath.s_int(recipe[DAT_WOOD]);
wood = adjustWoodRequired(wood, mob);
double roomValue = landValue * wood;
if (CMLib.beanCounter().getTotalAbsoluteValue(mob, landCurrency) < roomValue) {
commonTell(mob, L("You'll need @x1 to do that.", CMLib.beanCounter().nameCurrencyLong(landCurrency, roomValue)));
if (CMLib.moneyCounter().getTotalAbsoluteValue(mob, landCurrency) < roomValue) {
commonTell(mob, L("You'll need @x1 to do that.", CMLib.moneyCounter().nameCurrencyLong(landCurrency, roomValue)));
return false;
}
woodRequired = 0;
......@@ -1410,11 +1410,11 @@ public class BuildingSkill extends CraftingSkill implements CraftorAbility {
int wood = CMath.s_int(recipe[DAT_WOOD]);
wood = adjustWoodRequired(wood, mob);
double roomValue = landValue * wood;
CMLib.beanCounter().subtractMoney(mob, landCurrency, roomValue);
CMLib.moneyCounter().subtractMoney(mob, landCurrency, roomValue);
} else if (recipe[DAT_WOODTYPE].equalsIgnoreCase("MONEY")) {
int wood = CMath.s_int(recipe[DAT_WOOD]);
wood = adjustWoodRequired(wood, mob);
CMLib.beanCounter().subtractMoney(mob, landCurrency, wood);
CMLib.moneyCounter().subtractMoney(mob, landCurrency, wood);
}
verb = establishVerb(mob, recipe);
......
......@@ -635,7 +635,7 @@ public class CraftingSkill extends GatheringSkill {
if (pair == null) {
commonTell(mob, L("You don't know how to make '@x1'", recipeName));
} else {
final String viewDesc = CMLib.coffeeShops().getViewDescription(mob, pair.item);
final String viewDesc = CMLib.aetherShops().getViewDescription(mob, pair.item);
commonTell(mob, viewDesc);
pair.item.destroy();
if (pair.key != null)
......
......@@ -135,7 +135,7 @@ public class Hunting extends CommonSkill {
A.setMiscText("=20%");
found.addNonUninvokableEffect(A);
found.bringToLife(nearByRoom(), true);
CMLib.beanCounter().clearZeroMoney(found, null);
CMLib.moneyCounter().clearZeroMoney(found, null);
found.setMoneyVariation(0);
} else {
final StringBuffer str = new StringBuffer(L("You can't seem to find any game around here.\n\r"));
......
......@@ -200,7 +200,7 @@ public class Chant_BrownMold extends Chant {
newMOB.recoverMaxState();
newMOB.resetToMaxState();
newMOB.bringToLife(caster.location(), true);
CMLib.beanCounter().clearZeroMoney(newMOB, null);
CMLib.moneyCounter().clearZeroMoney(newMOB, null);
newMOB.setMoneyVariation(0);
newMOB.setStartRoom(null); // keep before postFollow for Conquest
CMLib.commands().postFollow(newMOB, caster, true);
......
......@@ -247,7 +247,7 @@ public class Chant_CallMate extends Chant {
newMOB.recoverMaxState();
newMOB.resetToMaxState();
newMOB.bringToLife(caster.location(), true);
CMLib.beanCounter().clearZeroMoney(newMOB, null);
CMLib.moneyCounter().clearZeroMoney(newMOB, null);
newMOB.setMoneyVariation(0);
if (victim != null) {
if (victim.getVictim() != newMOB)
......
......@@ -142,7 +142,7 @@ public class Chant_HowlersMoon extends Chant {
final Room newRoom = room.getRoomInDir(fromDir);
final int opDir = Directions.getOpDirectionCode(fromDir);
target.bringToLife(newRoom, true);
CMLib.beanCounter().clearZeroMoney(target, null);
CMLib.moneyCounter().clearZeroMoney(target, null);
target.setMoneyVariation(0);
target.location().showOthers(target, null, CMMsg.MSG_OK_ACTION, L("<S-NAME> appears!"));
newRoom.recoverRoomStats();
......
......@@ -88,7 +88,7 @@ public class Chant_KillerVine extends Chant_SummonVine {
newMOB.recoverMaxState();
newMOB.resetToMaxState();
newMOB.bringToLife(caster.location(), true);
CMLib.beanCounter().clearZeroMoney(newMOB, null);
CMLib.moneyCounter().clearZeroMoney(newMOB, null);
newMOB.setMoneyVariation(0);
newMOB.setStartRoom(null); // keep before postFollow for Conquest
CMLib.commands().postFollow(newMOB, caster, true);
......
......@@ -124,7 +124,7 @@ public class Chant_PoisonousVine extends Chant_SummonVine {
newMOB.recoverMaxState();
newMOB.resetToMaxState();
newMOB.bringToLife(caster.location(), true);
CMLib.beanCounter().clearZeroMoney(newMOB, null);
CMLib.moneyCounter().clearZeroMoney(newMOB, null);
newMOB.setMoneyVariation(0);
newMOB.setStartRoom(null); // keep before postFollow for Conquest
CMLib.commands().postFollow(newMOB, caster, true);
......
......@@ -268,7 +268,7 @@ public class Chant_SaplingWorkers extends Chant {
newMOB.recoverMaxState();
newMOB.resetToMaxState();
newMOB.bringToLife(caster.location(), true);
CMLib.beanCounter().clearZeroMoney(newMOB, null);
CMLib.moneyCounter().clearZeroMoney(newMOB, null);
newMOB.setMoneyVariation(0);
newMOB.setAttributesBitmap(0);
newMOB.setAttribute(MOB.Attrib.AUTOASSIST, true);
......
......@@ -142,7 +142,7 @@ public class Chant_SenseWater extends Chant {
if (msg2.length() > 0)
return E.name() + " is carrying some water.";
}
final ShopKeeper SK = CMLib.coffeeShops().getShopKeeper(E);
final ShopKeeper SK = CMLib.aetherShops().getShopKeeper(E);
if (SK != null) {
final StringBuffer msg2 = new StringBuffer("");
for (final Iterator<Environmental> i = SK.getShop().getStoreInventory(); i.hasNext(); ) {
......
......@@ -235,7 +235,7 @@ public class Chant_SpeakWithAnimals extends Chant implements Language {
else if ((msg.othersMessage() != null) && (msg.othersMessage().indexOf('\'') > 0)) {
String otherMes = msg.othersMessage();
if (msg.target() != null)
otherMes = CMLib.coffeeFilter().fullOutFilter((mob).session(), mob, msg.source(), msg.target(), msg.tool(), otherMes, false);
otherMes = CMLib.aetherFilter().fullOutFilter((mob).session(), mob, msg.source(), msg.target(), msg.tool(), otherMes, false);
msg.addTrailerMsg(CMClass.getMsg(msg.source(), affected, null, CMMsg.NO_EFFECT, msg.othersCode(), CMMsg.NO_EFFECT, L("@x1 (translated from @x2)", CMStrings.substituteSayInMessage(otherMes, str), msg.tool().name())));
}
}
......
......@@ -172,7 +172,7 @@ public class Chant_SummonAnimal extends Chant {
room.send(mob, msg);
final MOB target = determineMonster(mob, adjustedLevel(mob, asLevel));
target.bringToLife(newRoom, true);
CMLib.beanCounter().clearZeroMoney(target, null);
CMLib.moneyCounter().clearZeroMoney(target, null);
target.setMoneyVariation(0);
newRoom.showOthers(target, null, CMMsg.MSG_OK_ACTION, L("<S-NAME> appears!"));
newRoom.recoverRoomStats();
......@@ -352,7 +352,7 @@ public class Chant_SummonAnimal extends Chant {
MOB genM = CMClass.getMOB("GenMob");
for (String stat : genM.getStatCodes())
genM.setStat(stat, CMLib.coffeeMaker().getGenMobStat(newMOB, stat));
genM.setStat(stat, CMLib.aetherMaker().getGenMobStat(newMOB, stat));
genM.setBaseCharStats((CharStats) newMOB.baseCharStats().copyOf());
genM.setBasePhyStats((PhyStats) newMOB.basePhyStats().copyOf());
genM.setBaseState((CharState) newMOB.baseState().copyOf());
......
......@@ -272,7 +272,7 @@ public class Chant_SummonDustdevil extends Chant {
newMOB.recoverMaxState();
newMOB.resetToMaxState();
newMOB.bringToLife(caster.location(), true);
CMLib.beanCounter().clearZeroMoney(newMOB, null);
CMLib.moneyCounter().clearZeroMoney(newMOB, null);
newMOB.setMoneyVariation(0);
newMOB.location().showOthers(newMOB, null, CMMsg.MSG_OK_ACTION, L("<S-NAME> appear(s)!"));
newMOB.setStartRoom(null);
......
......@@ -223,7 +223,7 @@ public class Chant_SummonElemental extends Chant {
newMOB.recoverMaxState();
newMOB.resetToMaxState();
newMOB.bringToLife(caster.location(), true);
CMLib.beanCounter().clearZeroMoney(newMOB, null);
CMLib.moneyCounter().clearZeroMoney(newMOB, null);
newMOB.setMoneyVariation(0);
newMOB.location().showOthers(newMOB, null, CMMsg.MSG_OK_ACTION, L("<S-NAME> appears!"));
newMOB.setStartRoom(null);
......
......@@ -214,7 +214,7 @@ public class Chant_SummonFlyTrap extends Chant {
newMOB.recoverMaxState();
newMOB.resetToMaxState();
newMOB.bringToLife(caster.location(), true);
CMLib.beanCounter().clearZeroMoney(newMOB, null);
CMLib.moneyCounter().clearZeroMoney(newMOB, null);
newMOB.setMoneyVariation(0);
newMOB.location().show(newMOB, null, CMMsg.MSG_OK_ACTION, L("<S-NAME> grow(s) from the ground."));
newMOB.setStartRoom(null);
......
......@@ -169,7 +169,7 @@ public class Chant_SummonMount extends Chant {
mob.location().send(mob, msg);
final MOB target = determineMonster(mob, adjustedLevel(mob, asLevel));
target.bringToLife(newRoom, true);
CMLib.beanCounter().clearZeroMoney(target, null);
CMLib.moneyCounter().clearZeroMoney(target, null);
target.setMoneyVariation(0);
target.location().showOthers(target, null, CMMsg.MSG_OK_ACTION, L("<S-NAME> appears!"));
newRoom.recoverRoomStats();
......