update config & submodules & gridmaster slightly

FreddyMSchubert · FreddyMSchubert · commit 75747c62f4fc · 2025-08-09T09:47:19.000Z
diff --git a/bot/connection b/bot/connection
@@ -1 +1 @@
-Subproject commit 685845b220b0235179261c2f8ca0110e7f3a8032
+Subproject commit b9df8eec866a35df9dbfad5f90ab2c8a9afb25d7
diff --git a/bot/gridmaster/src/main.c b/bot/gridmaster/src/main.c
@@ -36,7 +36,7 @@ void ft_on_tick(unsigned long tick)
 	{
 		core_action_createUnit(nextUnit);
 		nextUnit++;
-		if (nextUnit > 2)
+		if (nextUnit > 1)
 			nextUnit = 0;
 	}
 
diff --git a/bot/gridmaster/src/pathfinding.c b/bot/gridmaster/src/pathfinding.c
@@ -61,10 +61,10 @@ static unsigned long movement_cost(t_pos pos, t_obj *unit)
 				return ULONG_MAX / 2;
 		}
 	}
-	else if (obj->type == OBJ_BOMB && obj->state == STATE_ALIVE)
-	{
-		return ULONG_MAX / 2;
-	}
+	// else if (obj->type == OBJ_BOMB && obj->state == STATE_ALIVE)
+	// {
+	// 	return ULONG_MAX / 2;
+	// }
 	else if (obj->type == OBJ_MONEY && obj->state == STATE_ALIVE)
 	{
 		if (unit->s_unit.unit_type == UNIT_CARRIER || unit->s_unit.unit_type == UNIT_MINER)
diff --git a/config.game.json b/config.game.json
@@ -2,51 +2,41 @@
 	"gridSize": 20,
 	"seed": 1,
 	"idleIncome": 0,
-	"idleIncomeTimeOut": 600,
+	"idleIncomeTimeOut": 0,
 	"resourceHp": 50,
 	"resourceIncome": 200,
-	"moneyObjIncome": 75,
+	"moneyObjIncome": 100,
 	"coreHp": 200,
-	"initialBalance": 300,
+	"initialBalance": 200,
 	"wallHp": 50,
 	"wallBuildCost": 20,
 	"bombHp": 50,
-	"bombCountdown": 25,
+	"bombCountdown": 10,
 	"bombThrowCost": 50,
 	"bombReach": 3,
 	"bombDamage": 50,
-	"worldGenerator": "jigsaw",
+	"worldGenerator": "distanced_resources",
 	"worldGeneratorConfig": {
-		"templatePlaceAttemptCount": 1000,
-		"additionalWallPlaceAttemptCount": 50,
-		"mirrorMap": true,
-		"resourceCount": 35,
-		"moneysCount": 25,
-		"minTemplateSpacing": 1,
-		"minCoreDistance": 5,
-		"baseResourceIncome": 150,
-		"resourceAdditionalIncomePerAdjacentWall": 40,
-		"resourceMultiplierIfFullySurrounded": 1.3,
-		"randomResourceIncomeVariation": 30,
-		"randomMoneyIncomeVariation": 20
+		"moneyChance": 4,
+		"resourceOrMoneyCount": 35
 	},
 	"units": [
 		{
 			"name": "Warrior",
 			"cost": 150,
-			"hp": 25,
+			"hp": 35,
 			"baseMoveCooldown": 3,
-			"maxMoveCooldown": 12,
+			"maxMoveCooldown": 5,
 			"damageCore": 10,
 			"damageUnit": 6,
-			"damageResource": 2,
-			"damageWall": 3,
+			"damageResource": 4,
+			"damageWall": 5,
 			"buildType": 0
 		},
 		{
 			"name": "Miner",
 			"cost": 100,
-			"hp": 15,
+			"hp": 20,
 			"baseMoveCooldown": 5,
 			"maxMoveCooldown": 10,
 			"damageCore": 3,
@@ -57,39 +47,15 @@
 		},
 		{
 			"name": "Carrier",
-			"cost": 125,
-			"hp": 5,
-			"baseMoveCooldown": 0,
-			"maxMoveCooldown": 0,
+			"cost": 200,
+			"hp": 10,
+			"baseMoveCooldown": 1,
+			"maxMoveCooldown": 1,
 			"damageCore": 1,
 			"damageUnit": 1,
-			"damageResource": 2,
+			"damageResource": 1,
 			"damageWall": 1,
 			"buildType": 0
-		},
-		{
-			"name": "Builder",
-			"cost": 300,
-			"hp": 30,
-			"baseMoveCooldown": 2,
-			"maxMoveCooldown": 8,
-			"damageCore": 5,
-			"damageUnit": 3,
-			"damageResource": 2,
-			"damageWall": 3,
-			"buildType": 1
-		},
-		{
-			"name": "Bomberman",
-			"cost": 200,
-			"hp": 40,
-			"baseMoveCooldown": 1,
-			"maxMoveCooldown": 10,
-			"damageCore": 20,
-			"damageUnit": 10,
-			"damageResource": 5,
-			"damageWall": 10,
-			"buildType": 2
 		}
 	],
 	"corePositions": [
diff --git a/config.server.json b/config.server.json
@@ -9,5 +9,5 @@
 	"timeoutTicks": 3000,
 	"timeoutMs": 60000,
 	"clientWaitTimeoutMs": 500,
-	"enableTerminalVisualizer": false
+	"enableTerminalVisualizer": true
 }
diff --git a/core b/core
@@ -1 +1 @@
-Subproject commit 7781b4f41a3acebbdbb827bd8fd062fd153c7f92
+Subproject commit 3e13167bf32c6ff32789f64c42deabb62d887ef5
diff --git a/debug-visualizer b/debug-visualizer
@@ -1 +1 @@
-Subproject commit 42d852d2030fafecb9e366f021fa550803876bab
+Subproject commit b851042d7c4e0c30285d25abad8e356a03cb5592

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ void ft_on_tick(unsigned long tick)`
`36`	`36`	`{`
`37`	`37`	`core_action_createUnit(nextUnit);`
`38`	`38`	`nextUnit++;`
`39`		`- if (nextUnit > 2)`
	`39`	`+ if (nextUnit > 1)`
`40`	`40`	`nextUnit = 0;`
`41`	`41`	`}`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -61,10 +61,10 @@ static unsigned long movement_cost(t_pos pos, t_obj *unit)`
`61`	`61`	`return ULONG_MAX / 2;`
`62`	`62`	`}`
`63`	`63`	`}`
`64`		`- else if (obj->type == OBJ_BOMB && obj->state == STATE_ALIVE)`
`65`		`- {`
`66`		`- return ULONG_MAX / 2;`
`67`		`- }`
	`64`	`+ // else if (obj->type == OBJ_BOMB && obj->state == STATE_ALIVE)`
	`65`	`+ // {`
	`66`	`+ // return ULONG_MAX / 2;`
	`67`	`+ // }`
`68`	`68`	`else if (obj->type == OBJ_MONEY && obj->state == STATE_ALIVE)`
`69`	`69`	`{`
`70`	`70`	`if (unit->s_unit.unit_type == UNIT_CARRIER \|\| unit->s_unit.unit_type == UNIT_MINER)`
Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,5 @@`
`9`	`9`	`"timeoutTicks": 3000,`
`10`	`10`	`"timeoutMs": 60000,`
`11`	`11`	`"clientWaitTimeoutMs": 500,`
`12`		`- "enableTerminalVisualizer": false`
	`12`	`+ "enableTerminalVisualizer": true`
`13`	`13`	`}`