Skip to content

Commit

Permalink
Final game server changes for Public Release
Browse files Browse the repository at this point in the history
  • Loading branch information
Randy Farmer committed Mar 19, 2018
1 parent 90594a8 commit b12d755
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion db/convertClientDataToJava.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ var table;
const Defaults = {
input: '../../habitat/sources/c64/beta.jlist',
output: '../src/main/java/org/made/neohabitat/NeoHabitat.java',
build: 'Version',
build: 'Public Release',
trace: 'info'};

/** Object holding command line args - parsed by yargs library: npm install yargs */
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/made/neohabitat/NeoHabitat.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

public class NeoHabitat {

public static final String BUILD_NAME = "Version";
public static final String BUILD_NAME = "Public Release";

public static final int RESOURCE_IMAGE = 0;
public static final int RESOURCE_ACTION = 1;
Expand All @@ -29,7 +29,7 @@ public class NeoHabitat {
public static final int[][][] ClassResources = {{{},{162,162,151,101,162,162,100,162,152,155,167,166,166,166,156,153,166,157,154},{27,60,83,125,126,127,128,129,77,78,130,131,132}},{{32,33,34,35,36,37,230},{0,163,1,101,2,3,100,145,5,6,7,163,8,9,137,10,150,11,12,13,14,163,15,163,16,163,163,163,17,19,20},{1,2,3,4,111,113,101,101,100,101,15,14}},{{38},{105,107,111,101,116,163,100,145},{44,45}},{{102},{163,162,163,101,163,163,100,145,162,162,162,162,162,162,137},{}},{{41},{21,162,111,101,22,23,100,145},{47,48,49,50,0}},{{221},{164,126,111,101,165,163,100,145,131},{119,120}},{{42,43},{98,126,111,101,119,114,100,145},{6,5}},{{44,55},{102,126,111,101,116,163,100,145},{}},{{},{},{}},{{},{},{}},{{49,50,51,52,138,121,56,53,138},{24,126,111,101,116,163,100,145},{}},{{},{},{}},{{56},{102,26,111,101,116,163,100,145,140,141},{}},{{58,59},{98,126,111,101,119,114,100,145},{10,9}},{{},{},{}},{{},{},{}},{{73},{102,124,111,101,116,163,100,145},{}},{{75},{122,126,111,101,116,163,100,145},{}},{{78},{102,162,111,101,117,113,100,145},{}},{{},{},{}},{{79},{102,126,111,101,116,163,99,145},{22,23}},{{80,81},{30,126,111,101,116,163,100,145,131},{121,122}},{{82},{102,162,111,101,117,113,100,145},{}},{{83,84,223,224,233,234,235},{97,162,121,101,163,163,100,145},{25,24}},{{85},{102,162,111,101,163,163,100,145},{}},{{86},{32,126,111,101,116,163,100,145,142},{}},{{88},{36,126,111,101,116,163,100,145,143},{28,29}},{{89},{37,38,111,101,116,163,100,145,39,40},{33,32,39,40}},{{87},{102,162,111,101,163,163,33,145,162,34,35,100},{117,118,69,70,77,78}},{{91},{102,126,111,101,110,163,100,145,131},{}},{{92,93,120},{41,126,111,101,116,163,100,145,133,135},{68}},{{98},{102,126,111,101,116,163,100,145},{}},{{99,100},{44,162,111,101,117,113,100,145,45},{30}},{{101},{106,108,111,101,116,163,100,145},{119,120}},{{},{},{}},{{103},{46,126,111,101,116,163,100,145,47},{7,8}},{{104,105},{102,162,120,101,163,112,100,145},{}},{{106,107,108,109},{48,123,111,101,116,163,100,145},{33,32,34}},{{110,111},{102,163,163,163,163,163,100,145,49},{35,36,37}},{{},{},{}},{{},{},{}},{{},{},{}},{{118,119},{59,126,111,101,116,163,100,145},{}},{{120,121,122,123,124,125,181,149,39,182,186,136,145,57},{106,108,111,101,116,163,100,145},{121,122}},{{126,127},{102,124,111,101,116,163,100,145},{}},{{128},{60,126,111,101,116,163,61,145,64,63,100},{31,87}},{{129,228},{105,107,111,101,116,163,100,145},{123,124}},{{130,131,132,133,181},{105,107,111,101,116,163,100,145},{44,45}},{{134},{102,162,111,101,163,163,100,145},{}},{{135},{122,126,111,101,116,163,100,145},{}},{{},{},{}},{{},{},{}},{{137,227,123,124,125,98},{125,126,111,101,116,163,100,145,132,134},{68,68}},{{},{},{}},{{138},{65,126,111,101,116,163,100,145},{115}},{{216,212,222},{25,126,111,101,162,162,100,145},{}},{{159,160,161,162,163,164,165},{102,162,111,101,163,163,100,145},{}},{{159,160,161,162,163,164,165},{102,162,111,101,163,163,100,145},{}},{{140,141,142},{102,126,111,101,110,163,100,145},{}},{{},{},{}},{{144},{105,107,111,101,116,163,100,145},{119,120}},{{146,147,148},{102,126,111,101,110,163,100,145},{}},{{},{},{}},{{},{},{}},{{152},{66,126,111,101,116,163,100,145,67},{65,63,64}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{104,105,166,167,168,169,170,171,172,173,44,199,211},{102,162,72,101,163,163,100,145},{}},{{54},{88,89,111,101,116,163,100,145},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{183},{102,162,111,101,163,83,84,145,85,86,87,138,100},{16,17,18,19,20,21,96,97,117,118,69,70,77,78}},{{184},{122,126,111,101,116,163,100,145},{}},{{185},{88,89,111,101,116,163,100,145},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{104,105,166,167,168,169,170,171,172,173,44,199,211},{102,162,120,101,163,163,100,145},{}},{{},{},{}},{{217,218},{95,126,111,101,116,163,100,145,96},{75,76}},{{},{},{}},{{70},{102,27,111,101,116,163,100,145,28},{11}},{{201,203},{90,162,111,101,163,91,100,145,92,93,138},{16,17,18,19,20,21,71,72,73}},{{202,204},{162,162,162,162,162,162,162,145},{}},{{187,188},{102,162,160,101,163,161,100,145,72,120,120,163},{}},{{112},{53,162,111,101,118,114,100,145,98},{10,9}},{{154},{102,70,111,101,116,163,100,145,71},{82}},{{153},{68,162,144,101,163,163,100,145,69},{98,99}},{{108},{48,78,111,101,116,163,100,145},{33,32,106,107,108,109,110}},{{189},{102,162,160,101,163,161,100,145,72,120,120,163},{}},{{104,105,166,167,168,169,170,171,172,173,44,199,211},{102,162,160,101,163,161,100,145,72,120,120,163},{}},{{220},{146,146,146,101,146,146,100,145},{}},{{174},{73,163,111,101,116,163,100,145,74},{67}},{{139,236},{158,162,111,101,117,113,100,145,159},{51,52}},{{44,45,46,63,64,65,177,147,148,143,91,74,142,190,191,192,193,194,195,196,211},{103,162,111,101,163,163,100,145,104},{123,124}},{{47},{162,162,162,162,162,162,162,162},{}},{{232,237},{103,162,111,101,117,113,100,145},{123,124}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31},{50,126,111,101,51,163,100,145,112},{}},{{},{},{}},{{40},{102,126,111,101,116,163,100,145,131},{}},{{48},{102,162,139,101,117,113,100,145},{}},{{60,61},{102,162,120,101,163,163,100,145},{}},{{113},{102,162,72,101,163,163,100,145},{}},{{62,63,64,65,66},{102,162,111,101,163,163,100,145},{}},{{67,68,69,69,67,77,226,226},{102,162,139,101,117,113,100,145},{}},{{71,83,72,231},{98,162,111,101,118,114,100,145},{13,12}},{{74},{102,162,111,101,163,29,100,145,136,138},{16,17,18,19,20,21,104,105}},{{76,76},{102,162,139,101,117,113,100,145},{}},{{90},{102,162,111,101,163,163,100,145},{}},{{94},{42,162,111,101,163,163,100,145,133,135},{68}},{{95},{102,162,111,101,163,43,100,145,136,138},{16,17,18,19,20,21,85,86,51,52}},{{96},{102,162,111,101,115,163,99,145},{}},{{},{},{}},{{114},{102,162,111,101,163,163,100,145},{}},{{115},{102,162,120,101,115,163,100,145},{}},{{},{},{}},{{},{},{}},{{143},{102,162,111,101,115,163,100,145},{}},{{},{},{}},{{},{},{}},{{150},{98,162,111,101,118,114,100,145},{10,9}},{{},{},{}},{{155,156,157,158},{102,162,111,101,163,163,100,145},{}},{{176},{102,162,120,101,163,112,100,145},{}},{{177,178},{102,162,111,101,163,163,100,145},{}},{{179,78,82,225},{102,162,111,101,117,113,100,145},{}},{{190,191,192,193,194,195,196,197,198,199,200,66,229},{102,162,111,101,163,163,100,145},{}},{{212,213,214,215},{102,162,111,101,163,163,100,145},{}},{{97},{102,162,111,101,163,163,99,145},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{},{},{}},{{219},{},{}}};

public static String GetBuildVersion() {
return String.format(BUILD_NAME + ":%tc", new Date(1519101116058l));
return String.format(BUILD_NAME + ":%tc", new Date(1521485918675l));
}

}
4 changes: 2 additions & 2 deletions src/main/java/org/made/neohabitat/mods/Avatar.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1191,9 +1191,9 @@ public void FNKEY(User from, OptInteger key, OptInteger target) {
object_say(from, UPGRADE_PREFIX + " You are connected to ");
object_say(from, " The Neoclassical Habitat Server ");
object_say(from, " The MADE, The Museum of Arts & Digital Entertainment, Oakland CA");
object_say(from, " ");
// object_say(from, " ");
// object_say(from, String.format("Light level: " + current_region().lighting + " Current heap: %d", current_region().space_usage));
object_say(from, "Open source - Join us! NeoHabitat.org ");
object_say(from, " Open source. Join us! NeoHabitat.org ");
object_say(from, NeoHabitat.GetBuildVersion());
send_reply_success(from);
break;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/made/neohabitat/mods/Region.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

public class Region extends Container implements UserWatcher, ContextMod, ContextShutdownWatcher, Constants {

public static String MOTD = "Welcome to Habitat! For help see http://neohabitat.org";
public static String MOTD = "Welcome to Habitat! Browse to http://v.ht/habitat for 2nd screen web tour guide.";

/** Static flag on if new features should be activated. Anyone can toggle with //neohabitat */
public static boolean NEOHABITAT_FEATURES = true;
Expand Down

0 comments on commit b12d755

Please sign in to comment.