GDC charges and bank balances. Make sure there's enough for us to las…

…t awhile.
frandallfarmer · Feb 28, 2017 · 4bc55d4 · 4bc55d4
1 parent b0990eb
commit 4bc55d4
Show file tree

Hide file tree

Showing 16 changed files with 29 additions and 16 deletions.
diff --git a/bridge/Habitat2ElkoBridge.js b/bridge/Habitat2ElkoBridge.js
@@ -160,7 +160,7 @@ function confirmOrCreateUser(fullName) {
 							"x": 10,
 							"y": 128 + rnd(32),
 							"bodyType": "male",
-							"bankBalance": 5000,
+							"bankBalance": 50000,
 							"custom": [rnd(15) + rnd(15)*16, rnd(15) + rnd(15)*16],
 							"nitty_bits": 0
 						}

diff --git a/db/Backroom/item-chest.chainsaw.json b/db/Backroom/item-chest.chainsaw.json
@@ -11,7 +11,7 @@
 			"orientation": 8,
 			"magic_type": 1,
 			"gr_state": 1,
-			"charges": 10
+			"charges": 100
 		}
 	]
 }
diff --git a/db/Backroom/item-table.many.spray_cans.json b/db/Backroom/item-table.many.spray_cans.json
@@ -0,0 +1,13 @@
+{
+	"type": "item",
+	"ref": "item-library.spray_can",
+	"name": "Spray Can",
+	"in": "item-table.table",
+	"mods": [
+		{
+			"type": "Spray_can",
+			"y": 4,
+			"orientation": 64
+		}
+		]
+}
diff --git a/db/Users/user-aric.json b/db/Users/user-aric.json
@@ -8,7 +8,7 @@
 			"x": 20,
 			"y": 130,
 			"bodyType": "male",
-			"bankBalance": 2000,
+			"bankBalance": 50000,
 			"custom": [221, 51]
 		}
 	]

diff --git a/db/Users/user-chip.json b/db/Users/user-chip.json
@@ -8,7 +8,7 @@
 			"x": 136,
 			"y": 130,
 			"bodyType": "male",
-			"bankBalance": 10000,
+			"bankBalance": 50000,
 			"custom": [68, 68],
 			"nitty_bits": 8
 		}

diff --git a/db/Users/user-janet.json b/db/Users/user-janet.json
@@ -8,7 +8,7 @@
 			"x": 50,
 			"y": 130,
 			"bodyType": "female",
-			"bankBalance": 15000,
+			"bankBalance": 50000,
 			"custom": [102, 136]
 		}
 	]

diff --git a/db/Users/user-keith.json b/db/Users/user-keith.json
@@ -8,7 +8,7 @@
 			"x": 0,
 			"y": 150,			
 			"bodyType": "male",
-			"bankBalance": 10000,
+			"bankBalance": 50000,
 			"custom": [17, 17],
 			"nitty_bits": 8
 		}

diff --git a/db/Users/user-keith2.json b/db/Users/user-keith2.json
@@ -8,7 +8,7 @@
 			"x": 0,
 			"y": 150,			
 			"bodyType": "male",
-			"bankBalance": 10000,
+			"bankBalance": 50000,
 			"custom": [17, 17],
 			"nitty_bits": 8
 		}

diff --git a/db/Users/user-keith3.json b/db/Users/user-keith3.json
@@ -8,7 +8,7 @@
 			"x": 0,
 			"y": 150,			
 			"bodyType": "male",
-			"bankBalance": 10000,
+			"bankBalance": 50000,
 			"custom": [17, 17],
 			"nitty_bits": 8
 		}

diff --git a/db/Users/user-pcollins.json b/db/Users/user-pcollins.json
@@ -9,7 +9,7 @@
         "x": 100,
         "y": 130,
         "bodyType": "male",
-        "bankBalance": 2000,
+        "bankBalance": 50000,
         "custom": [17, 151],
         "nitty_bits": 8
       }

diff --git a/db/Users/user-randy.json b/db/Users/user-randy.json
@@ -8,7 +8,7 @@
 			"x": 0,
 			"y": 150,			
 			"bodyType": "male",
-			"bankBalance": 500,
+			"bankBalance": 50000,
 			"custom": [17, 17],
 			"nitty_bits": 8
 		}

diff --git a/db/Users/user-rassilon.json b/db/Users/user-rassilon.json
@@ -8,7 +8,7 @@
 			"x": 0,
 			"y": 150,			
 			"bodyType": "male",
-			"bankBalance": 500,
+			"bankBalance": 50000,
 			"custom": [17,51],
 			"nitty_bits": 8
 		}

diff --git a/db/Users/user-steve.json b/db/Users/user-steve.json
@@ -9,7 +9,7 @@
 				"x": 100,
 				"y": 130,
 				"bodyType": "male",
-				"bankBalance": 2000,
+				"bankBalance": 50000,
 				"custom": [17, 151],
 				"nitty_bits": 8
 			}

diff --git a/db/Users/user-stu.json b/db/Users/user-stu.json
@@ -8,7 +8,7 @@
 			"x": 0,
 			"y": 110,			
 			"bodyType": "male",
-			"bankBalance": 500,
+			"bankBalance": 50000,
 			"custom": [17, 119],
 			"nitty_bits": 8
 		}

diff --git a/db/Users/user-vonguard.json b/db/Users/user-vonguard.json
@@ -8,7 +8,7 @@
 			"x": 0,
 			"y": 130,			
 			"bodyType": "male",
-			"bankBalance": 500,
+			"bankBalance": 50000,
 			"custom": [170, 119],
 			"nitty_bits": 8
 		}

diff --git a/src/main/java/org/made/neohabitat/mods/Spray_can.java b/src/main/java/org/made/neohabitat/mods/Spray_can.java
@@ -57,13 +57,13 @@ public boolean filler() {
     public static final int ARM_LIMB = 2;
     public static final int FACE_LIMB = 3;
 
-    protected int charge = 10;
+    protected int charge = 100;
 
     @JSONMethod({ "style", "x", "y", "orientation", "gr_state", "charge" })
     public Spray_can(OptInteger style, OptInteger x, OptInteger y, OptInteger orientation,
         OptInteger gr_state, OptInteger charge) {
         super(style, x, y, orientation, gr_state);
-        this.charge = charge.value(10);
+        this.charge = charge.value(100);
     }
 
     public Spray_can(int style, int x, int y, int orientation, int gr_state, int charge) {