Release 22.08.28

GameLauncher.spec

@@ -3,8 +3,8 @@
 block_cipher = None
 
 
-a = Analysis(['src\\main.py'],
-             pathex=['C:\\Users\\ninon\\Google Drive\\CodeNameEmpty-NightlyDev\\CodeNameEmpty'],
+a = Analysis(['src\\launchGame.py'],
+             pathex=['F:\\Drive\\CodeNameEmptyRestart\\CodeNameEmpty'],
              binaries=[],
              datas=[],
              hiddenimports=[],

compile.bat

@@ -1,6 +1,16 @@
-pyinstaller --onefile --clean --noconsole^
-    -n GameLauncher ^
-    GameLauncher.spec
+echo Creating executable...
+pyinstaller GameLauncher.spec
+
+echo Created executable.
+echo Creating res directory...
 
 xcopy /s /y /f src\res dist\res
+rem     xcopy /y /f src\res dist\res
+
+echo Created res directory.
+
+rem echo Zipping res directory...
+rem python zipResources.py
+rem echo Zip complete.
+
 pause

src/res/official/areas/area_forest.json → dist/res/official/areas/area_gen_forest_1.json

@@ -1,61 +1,37 @@
 {
 	"name":[
-		"The $nameAdjs $names's $forest",
-		"The $names's $forest",
-		"The $adjs $forest",
-		"$adjs $forest"
+		"The $names's $forest Trail",
+		"The $adjs $forest Trail",
+		"$adjs $forest Trail"
 	],
 	"names":{
 		"type":"choose",
 		"choices":[
 			"Elder",
-			"God",
 			"King",
 			"Queen",
-			"Dragon",
 			"Bear",
-			"Ruffian",
-			"Troublemaker",
 			"Huntsman"
 		]
 	},
 	"forest":{
 		"type":"choose",
 		"choices":[
 			"Forest",
-			"Woods",
 			"Thicket",
-			"Woodland",
-			"Timberland",
-			"Wilds",
-			"Grove"
+			"Grove",
+            "Wilderness",
+            "Woodland"
 		]
 	},
 	"adjs":{
 		"type":"choose",
 		"choices":[
-			"Red",
 			"Yellow",
 			"Green",
-			"Black",
-			"Dark",
 			"Sunny",
 			"Foggy",
 			"Dense",
-			"Royal",
-			"Broken",
-			"Old"
-		]
-	},
-	"nameAdjs":{
-		"type":"choose",
-		"choices":[
-			"Good",
-			"Holy",
-			"Evil",
-			"Cruel",
-			"Loving",
-			"Loved",
 			"Old"
 		]
 	},
@@ -67,20 +43,22 @@
 	],
 	"aType":"Forest",
 	"hostilityMin":1,
-	"hostilityMax":5,
-	"eventChance":10,
+	"hostilityMax":4,
+	"eventChance":45,
 	"events":[
-		["event_lostItem", "1d8"],
-		["event_flipACoin", "1d8"],
-		["event_forestAreaMisc", "2d8"],
-		["event_forestAreaMisc2", "2d8"]
+		["event_lostItem", "1d20"],
+		["event_flipACoin", "1d20"],
+		["event_forestAreaMisc", "1d20+6"],
+		["event_forestAreaMisc2", "1d20+6"],
+		["event_forest_apple", "1d20+3"],
+		["event_forgotten_item", "1d15"]
 	],
-	"enemyChance":10,
+	"hostilityAffectsEnemyChance":true,
+	"enemyChance":15,
 	"enemyPointsPerHostility":2,
 	"enemies":[
 		["enemy_rodentOfUnusualSize", 2],
 		["enemy_wolf",3],
-		["enemy_bandit", 5],
 		["enemy_greatWolf",7]
 	],
 	"npcChance":0,
@@ -90,7 +68,8 @@
 	"minNewAreas":3,
 	"maxNewAreas":6,
 	"areas":[
-		["area_forest","2d5", ["required"]],
-		["area_strongHold","1d6"]
+		["area_gen_forest_1","2d5", ["required"]],
+		["area_gen_forest_2","2d5"],
+		["area_gen_forest_3","2d5"]
 	]
 }

dist/res/official/areas/area_gen_forest_2.json

@@ -0,0 +1,74 @@
+{
+    "name":[
+		"The $names's $forest",
+		"The $adjs $forest",
+		"$adjs $forest"
+	],
+	"names":{
+		"type":"choose",
+		"choices":[
+			"Elder",
+			"King",
+			"Queen",
+			"Bear",
+			"Huntsman"
+		]
+	},
+	"forest":{
+		"type":"choose",
+		"choices":[
+			"Forest",
+			"Thicket",
+			"Grove",
+            "Wilderness",
+            "Woodland"
+		]
+	},
+	"adjs":{
+		"type":"choose",
+		"choices":[
+			"Yellow",
+			"Green",
+			"Sunny",
+			"Foggy",
+			"Dense",
+			"Old"
+		]
+	},
+    "desc":[
+        "Trees surround you on either side. There is an eerie sound of an owl in the distance.\nYou push past the trees as you continue moving forward.",
+        "It is almost impossible to see past the trees.\nYou continue to push on.",
+        "Next to no light is able to pass through the thick layer of leaves above.\nThe few beams of light guide you as you go on.",
+        "There is a slight chill to the air, probably because of the lack of sunlight.\nAt least you won't sweat as you hike on."
+    ],
+	"aType":"Forest",
+	"hostilityMin":3,
+	"hostilityMax":6,
+	"eventChance":35,
+	"events":[
+		["event_lostItem", "1d20"],
+		["event_forestAreaMisc", "1d20+6"],
+		["event_forestAreaMisc2", "1d20+6"],
+		["event_forest_apple", "1d20+3"],
+		["event_forgotten_item", "1d15"]
+	],
+	"hostilityAffectsEnemyChance":true,
+	"enemyChance":15,
+	"enemyPointsPerHostility":3,
+	"enemies":[
+		["enemy_wolf",4],
+		["enemy_bandit",6],
+		["enemy_greatWolf",8]
+	],
+	"npcChance":0,
+	"npcs":[
+	],
+	"minNewAreas":2,
+	"maxNewAreas":6,
+	"areas":[
+        ["area_gen_forest_2", "1d8"],
+        ["area_gen_forest_1", "2d6"],
+        ["area_gen_forest_3", "2d6"],
+        ["area_gen_forest_4", "2d6"]
+	]
+}

dist/res/official/areas/area_gen_forest_3.json

@@ -0,0 +1,78 @@
+{
+    "name":[
+		"The $names's $forest Trail",
+		"The $adjs $forest Trail",
+		"$adjs $forest Trail"
+	],
+	"names":{
+		"type":"choose",
+		"choices":[
+			"Elder",
+			"King",
+			"Queen",
+			"Bear",
+			"Huntsman"
+		]
+	},
+	"forest":{
+		"type":"choose",
+		"choices":[
+			"Forest",
+			"Thicket",
+			"Grove",
+            "Wilderness",
+            "Woodland"
+		]
+	},
+	"adjs":{
+		"type":"choose",
+		"choices":[
+			"Yellow",
+			"Green",
+			"Sunny",
+			"Bright",
+			"Foggy",
+			"Dense",
+			"Old"
+		]
+	},
+    "desc":[
+        "Trees surround you on either side. There is an eerie sound of an owl in the distance.\nYou push past the trees as you continue moving forward.",
+        "It is almost impossible to see past the trees.\nYou continue to push on.",
+        "Next to no light is able to pass through the thick layer of leaves above.\nThe few beams of light guide you as you go on.",
+        "There is a slight chill to the air, probably because of the lack of sunlight.\nAt least you won't sweat as you hike on."
+    ],
+	"aType":"Forest",
+	"hostilityMin":2,
+	"hostilityMax":4,
+	"eventChance":40,
+	"events":[
+		["event_lostItem", "1d20"],
+		["event_flipACoin", "1d20"],
+		["event_forestAreaMisc", "1d20+6"],
+		["event_forestAreaMisc2", "1d20+6"],
+		["event_forest_apple", "1d20+3"],
+		["event_forgotten_item", "1d15"]
+	],
+	"hostilityAffectsEnemyChance":true,
+	"enemyChance":20,
+	"enemyPointsPerHostility":2,
+	"enemies":[
+		["enemy_rodentOfUnusualSize", 2],
+		["enemy_wolf",3],
+		["enemy_greatWolf",7]
+	],
+	"npcChance":0,
+	"npcs":[
+	],
+	"minNewAreas":3,
+	"maxNewAreas":6,
+	"areas":[
+        ["area_gen_forest_1", "2d6"],
+        ["area_gen_forest_2", "2d6"],
+        ["area_gen_forest_3", "1d8", ["required"]],
+        ["area_gen_forest_4", "1d12"],
+        ["cave_wolf_entrance", "1d8"],
+		["area_village_gate_east", "2d6", ["limited"]]
+	]
+}