added armor_vs; now "damage_vs" works with "is_a"; packages (experime…

…ntal) Also: - restored the "attack!" notification (will probably require limiting it a bit more) - moved multi maps to res - zipped jl4 map - mods.txt replaced with "mods" keyword in campaign.txt - "title" keyword in campaign.txt - new constraint: a complex mission map must be stored as a zip file
soundmud · Jun 25, 2023 · 7c8fcb7 · 7c8fcb7
1 parent c5169cc
commit 7c8fcb7
Show file tree

Hide file tree

Showing 185 changed files with 2,061 additions and 1,409 deletions.
diff --git a/buildmultimapslist.py b/buildmultimapslist.py
diff --git a/cfg/official_maps.txt b/cfg/official_maps.txt
diff --git a/cfg/package_servers.txt b/cfg/package_servers.txt
@@ -0,0 +1,2 @@
+;uncomment a package server to activate it
+;http://jlpo.free.fr/soundrts/packages/
diff --git a/cfg/parameters.toml b/cfg/parameters.toml
@@ -35,3 +35,8 @@ soundpack = 0.8
 
 [volume]
 1000 = 0.5
+
+[packages]
+# A package is a folder or a zip file.
+base = "res"
+additional = ["", "user", "user/downloaded"]
diff --git a/doc_src/src/en/mapmaking.rst b/doc_src/src/en/mapmaking.rst
@@ -19,7 +19,7 @@ then you can store your first multiplayer map in the "multi" folder.
 
 If you are not allowed to write in the program files folder because you work in non-admin mode, you can store your working map file in the "multi"
 folder in "C:\\Documents and Settings\\Your Login\\Application Data\\SoundRTS". This folder is created the first time you start SoundRTS, unless a "user" folder exists near soundrts.exe.
-Another solution is to install SoundRTS in a folder where you are allowed to write, and to work in the folder mentionned in the previous paragraph.
+Another solution is to install SoundRTS in a folder where you are allowed to write, and to work in the folder mentioned in the previous paragraph.
 
 How to edit a map
 """""""""""""""""
@@ -37,9 +37,7 @@ A useful key combination is Control Shift F2: if you are the only human on the m
 How to find and remove an error
 """""""""""""""""""""""""""""""
 
-If, when you start the map, you get the message: "server error" and go back to the server menu, then the details of the error are in a file called "maperror.txt". This file is in your default temporary folder (for example "C:\\Documents and Settings\\Your Login\\Local Settings\\Temp\\soundrts") or in the SoundRTS folder.
-
-In the same directory you may find additional (but cryptic) information in "server.log" or in "client.log".
+If, when you start the map, you get a "map error" message and go back to the menu, then you may sometimes find additional (but cryptic) information in "client.log" or in "server.log", usually in the "user/tmp" folder.
 
 If you still don't understand where the error is, feel free to contact me, directly or at the soundRTSChat list.
 
@@ -324,7 +322,7 @@ If you are allowed to write in the folder where SoundRTS (or SoundRTS test) is i
 
 If you are not allowed to write in the program files folder because you work in non-admin mode, you can store your working map file in the "single"
 folder in "C:\\Documents and Settings\\Your Login\\Application Data\\SoundRTS". This folder is created the first time you start SoundRTS.
-Another solution is to install SoundRTS in a folder where you are allowed to write, and to work in the folder mentionned in the previous paragraph.
+Another solution is to install SoundRTS in a folder where you are allowed to write, and to work in the folder mentioned in the previous paragraph.
 
 Structure of the campaign folder
 """"""""""""""""""""""""""""""""
@@ -496,7 +494,7 @@ Press PageUp or PageDown to select a terrain. The meaning of each terrain is sto
 Apply a terrain to a square
 """""""""""""""""""""""""""
 
-Press Enter to apply the terrain to the current square. Neighboring squares with the same caracteristics (ground and same height) will be linked automatically by a path. Different squares will have their path removed.
+Press Enter to apply the terrain to the current square. Neighboring squares with the same characteristics (ground and same height) will be linked automatically by a path. Different squares will have their path removed.
 
 Toggle path to a neighbor
 """""""""""""""""""""""""
@@ -516,4 +514,4 @@ Press F10 and quit the game to leave the editor. An autosave of the map will be
 Add units
 """""""""
 
-Open the file in a text editor. Use commands mentionned in `Defining the starting resources of the players`_.
+Open the file in a text editor. Use commands mentioned in `Defining the starting resources of the players`_.
diff --git a/doc_src/src/en/relnotes.rst b/doc_src/src/en/relnotes.rst
@@ -3,6 +3,12 @@ Release notes
 
 .. contents::
 
+1.3.7 (to be released)
+-----
+
+- removed the "maperror.txt" file (the information is already in the in-game error message).
+
+
 1.3.6
 -----
 
@@ -226,4 +232,4 @@ Interface improvements:
 - the description of a patrol order will recapitulate all the waypoints
 - bug fixed: pressing Tab would select blocked exits
 - bug fixed: it is no longer possible to build another wall on the same exit
-- zoom mode: if no building land is found while a build order has been validated on a sub-square, an error will be raised (instead of searching for a building land in the enclosing square
+- zoom mode: if no building land is found while a build order has been validated on a sub-square, an error will be raised (instead of searching for a building land in the enclosing square
diff --git a/requirements.txt b/requirements.txt
@@ -1,9 +1,11 @@
 upnpclient
 
-pygame>=2
+pygame
 git+https://github.com/soundmud/accessible_output2
 chardet
 cloudpickle
+requests
+tomli
 
 docutils
 cx_Freeze

diff --git a/multi/b1.txt → res/multi/b1.txt b/multi/b1.txt → res/multi/b1.txt
diff --git a/multi/b2.txt → res/multi/b2.txt b/multi/b2.txt → res/multi/b2.txt
diff --git a/multi/bs1.txt → res/multi/bs1.txt b/multi/bs1.txt → res/multi/bs1.txt
diff --git a/multi/bs2.txt → res/multi/bs2.txt b/multi/bs2.txt → res/multi/bs2.txt
diff --git a/multi/can1.txt → res/multi/can1.txt b/multi/can1.txt → res/multi/can1.txt
diff --git a/multi/can2.txt → res/multi/can2.txt b/multi/can2.txt → res/multi/can2.txt
diff --git a/multi/can3.txt → res/multi/can3.txt b/multi/can3.txt → res/multi/can3.txt
diff --git a/multi/can4.txt → res/multi/can4.txt b/multi/can4.txt → res/multi/can4.txt
diff --git a/multi/can5.txt → res/multi/can5.txt b/multi/can5.txt → res/multi/can5.txt
diff --git a/multi/ce1.txt → res/multi/ce1.txt b/multi/ce1.txt → res/multi/ce1.txt
diff --git a/multi/ce2.txt → res/multi/ce2.txt b/multi/ce2.txt → res/multi/ce2.txt
diff --git a/multi/ce3.txt → res/multi/ce3.txt b/multi/ce3.txt → res/multi/ce3.txt
diff --git a/multi/ce4.txt → res/multi/ce4.txt b/multi/ce4.txt → res/multi/ce4.txt
diff --git a/multi/ce5.txt → res/multi/ce5.txt b/multi/ce5.txt → res/multi/ce5.txt
diff --git a/multi/cw1.txt → res/multi/cw1.txt b/multi/cw1.txt → res/multi/cw1.txt
diff --git a/multi/jl1.txt → res/multi/jl1.txt b/multi/jl1.txt → res/multi/jl1.txt
diff --git a/multi/jl2.txt → res/multi/jl2.txt b/multi/jl2.txt → res/multi/jl2.txt
diff --git a/multi/jl3.txt → res/multi/jl3.txt b/multi/jl3.txt → res/multi/jl3.txt
diff --git a/res/multi/jl4.zip b/res/multi/jl4.zip
diff --git a/multi/jl5.txt → res/multi/jl5.txt b/multi/jl5.txt → res/multi/jl5.txt
diff --git a/multi/jl6.txt → res/multi/jl6.txt b/multi/jl6.txt → res/multi/jl6.txt
diff --git a/multi/jl7.txt → res/multi/jl7.txt b/multi/jl7.txt → res/multi/jl7.txt
diff --git a/multi/jl8.txt → res/multi/jl8.txt b/multi/jl8.txt → res/multi/jl8.txt
diff --git a/multi/js1.txt → res/multi/js1.txt b/multi/js1.txt → res/multi/js1.txt
diff --git a/multi/js10.txt → res/multi/js10.txt b/multi/js10.txt → res/multi/js10.txt
diff --git a/multi/js11.txt → res/multi/js11.txt b/multi/js11.txt → res/multi/js11.txt
diff --git a/multi/js12.txt → res/multi/js12.txt b/multi/js12.txt → res/multi/js12.txt
diff --git a/multi/js13.txt → res/multi/js13.txt b/multi/js13.txt → res/multi/js13.txt
diff --git a/multi/js14.txt → res/multi/js14.txt b/multi/js14.txt → res/multi/js14.txt
diff --git a/multi/js15.txt → res/multi/js15.txt b/multi/js15.txt → res/multi/js15.txt
diff --git a/multi/js2.txt → res/multi/js2.txt b/multi/js2.txt → res/multi/js2.txt
diff --git a/multi/js3.txt → res/multi/js3.txt b/multi/js3.txt → res/multi/js3.txt
diff --git a/multi/js4.txt → res/multi/js4.txt b/multi/js4.txt → res/multi/js4.txt
diff --git a/multi/js5.txt → res/multi/js5.txt b/multi/js5.txt → res/multi/js5.txt
diff --git a/multi/js6.txt → res/multi/js6.txt b/multi/js6.txt → res/multi/js6.txt
diff --git a/multi/js7.txt → res/multi/js7.txt b/multi/js7.txt → res/multi/js7.txt
diff --git a/multi/js8.txt → res/multi/js8.txt b/multi/js8.txt → res/multi/js8.txt
diff --git a/multi/js9.txt → res/multi/js9.txt b/multi/js9.txt → res/multi/js9.txt
diff --git a/multi/kel1.txt → res/multi/kel1.txt b/multi/kel1.txt → res/multi/kel1.txt
diff --git a/multi/kel2.txt → res/multi/kel2.txt b/multi/kel2.txt → res/multi/kel2.txt
diff --git a/multi/kel3.txt → res/multi/kel3.txt b/multi/kel3.txt → res/multi/kel3.txt
diff --git a/multi/kel4.txt → res/multi/kel4.txt b/multi/kel4.txt → res/multi/kel4.txt
diff --git a/multi/kel5.txt → res/multi/kel5.txt b/multi/kel5.txt → res/multi/kel5.txt
diff --git a/multi/kel6.txt → res/multi/kel6.txt b/multi/kel6.txt → res/multi/kel6.txt
diff --git a/multi/m1.txt → res/multi/m1.txt b/multi/m1.txt → res/multi/m1.txt
diff --git a/multi/m2.txt → res/multi/m2.txt b/multi/m2.txt → res/multi/m2.txt
diff --git a/multi/mb1.txt → res/multi/mb1.txt b/multi/mb1.txt → res/multi/mb1.txt
diff --git a/multi/mb2.txt → res/multi/mb2.txt b/multi/mb2.txt → res/multi/mb2.txt
diff --git a/multi/mb3.txt → res/multi/mb3.txt b/multi/mb3.txt → res/multi/mb3.txt
diff --git a/multi/mb4.txt → res/multi/mb4.txt b/multi/mb4.txt → res/multi/mb4.txt
diff --git a/multi/mb5.txt → res/multi/mb5.txt b/multi/mb5.txt → res/multi/mb5.txt
diff --git a/multi/mb6.txt → res/multi/mb6.txt b/multi/mb6.txt → res/multi/mb6.txt
diff --git a/multi/mb7.txt → res/multi/mb7.txt b/multi/mb7.txt → res/multi/mb7.txt
diff --git a/multi/mb8.txt → res/multi/mb8.txt b/multi/mb8.txt → res/multi/mb8.txt
diff --git a/multi/mb9.txt → res/multi/mb9.txt b/multi/mb9.txt → res/multi/mb9.txt
diff --git a/multi/onj1.txt → res/multi/onj1.txt b/multi/onj1.txt → res/multi/onj1.txt
diff --git a/multi/pm1.txt → res/multi/pm1.txt b/multi/pm1.txt → res/multi/pm1.txt
diff --git a/multi/pm2.txt → res/multi/pm2.txt b/multi/pm2.txt → res/multi/pm2.txt
diff --git a/multi/pm3.txt → res/multi/pm3.txt b/multi/pm3.txt → res/multi/pm3.txt
diff --git a/multi/pm4.txt → res/multi/pm4.txt b/multi/pm4.txt → res/multi/pm4.txt
diff --git a/multi/pm5.txt → res/multi/pm5.txt b/multi/pm5.txt → res/multi/pm5.txt
diff --git a/multi/pm6.txt → res/multi/pm6.txt b/multi/pm6.txt → res/multi/pm6.txt
diff --git a/multi/pra1.txt → res/multi/pra1.txt b/multi/pra1.txt → res/multi/pra1.txt
diff --git a/multi/pra10.txt → res/multi/pra10.txt b/multi/pra10.txt → res/multi/pra10.txt
diff --git a/multi/pra11.txt → res/multi/pra11.txt b/multi/pra11.txt → res/multi/pra11.txt
diff --git a/multi/pra2.txt → res/multi/pra2.txt b/multi/pra2.txt → res/multi/pra2.txt
diff --git a/multi/pra3.txt → res/multi/pra3.txt b/multi/pra3.txt → res/multi/pra3.txt
diff --git a/multi/pra4.txt → res/multi/pra4.txt b/multi/pra4.txt → res/multi/pra4.txt
diff --git a/multi/pra5.txt → res/multi/pra5.txt b/multi/pra5.txt → res/multi/pra5.txt
diff --git a/multi/pra6.txt → res/multi/pra6.txt b/multi/pra6.txt → res/multi/pra6.txt
diff --git a/multi/pra7.txt → res/multi/pra7.txt b/multi/pra7.txt → res/multi/pra7.txt
diff --git a/multi/pra8.txt → res/multi/pra8.txt b/multi/pra8.txt → res/multi/pra8.txt
diff --git a/multi/pra9.txt → res/multi/pra9.txt b/multi/pra9.txt → res/multi/pra9.txt
diff --git a/multi/qc1.txt → res/multi/qc1.txt b/multi/qc1.txt → res/multi/qc1.txt
diff --git a/multi/qc2.txt → res/multi/qc2.txt b/multi/qc2.txt → res/multi/qc2.txt
diff --git a/multi/qc3.txt → res/multi/qc3.txt b/multi/qc3.txt → res/multi/qc3.txt
diff --git a/multi/sg1.txt → res/multi/sg1.txt b/multi/sg1.txt → res/multi/sg1.txt
diff --git a/multi/sg2.txt → res/multi/sg2.txt b/multi/sg2.txt → res/multi/sg2.txt
diff --git a/multi/sg3.txt → res/multi/sg3.txt b/multi/sg3.txt → res/multi/sg3.txt
diff --git a/multi/sg4.txt → res/multi/sg4.txt b/multi/sg4.txt → res/multi/sg4.txt
diff --git a/multi/swk1.txt → res/multi/swk1.txt b/multi/swk1.txt → res/multi/swk1.txt
diff --git a/multi/swk2a.txt → res/multi/swk2a.txt b/multi/swk2a.txt → res/multi/swk2a.txt
diff --git a/multi/swk2b.txt → res/multi/swk2b.txt b/multi/swk2b.txt → res/multi/swk2b.txt
diff --git a/multi/swk2c.txt → res/multi/swk2c.txt b/multi/swk2c.txt → res/multi/swk2c.txt
diff --git a/multi/z1.txt → res/multi/z1.txt b/multi/z1.txt → res/multi/z1.txt
diff --git a/multi/z2.txt → res/multi/z2.txt b/multi/z2.txt → res/multi/z2.txt
diff --git a/multi/z3.txt → res/multi/z3.txt b/multi/z3.txt → res/multi/z3.txt
diff --git a/multi/z4.txt → res/multi/z4.txt b/multi/z4.txt → res/multi/z4.txt
diff --git a/multi/z5.txt → res/multi/z5.txt b/multi/z5.txt → res/multi/z5.txt
diff --git a/rules2doc.py b/rules2doc.py
@@ -2,6 +2,8 @@
 from typing import Set
 
 from soundrts.lib import log
+from soundrts.lib.package import Package
+from soundrts.paths import BASE_PACKAGE_PATH
 
 log.add_console_handler()
 
@@ -147,7 +149,8 @@ def can_use(c, t):
 
 
 rules = RulesForDoc()
-rules.load(open("res/rules.txt").read(), open("res/ui/rules_doc.txt").read())
+base = Package.from_path(BASE_PACKAGE_PATH)
+rules.load(base.open_text("rules.txt").read(), base.open_text("ui/rules_doc.txt").read())
 for cat in (
     ("1. Units", ("worker", "soldier")),
     ("2. Buildings", ("building",)),

diff --git a/setup.py b/setup.py
@@ -16,7 +16,6 @@
 from cx_Freeze import Executable, setup
 
 import builddoc
-import buildmultimapslist
 from soundrts.version import VERSION
 
 if platform.system() == "Windows" and ".venv" not in sys.executable:
@@ -36,15 +35,14 @@
     "silent": True,
     "packages": [],
     "excludes": ["Cython", "scipy", "numpy", "tkinter"],
-    "include_files": ["res", "single", "multi", "mods", "cfg", "doc"],
+    "include_files": ["res", "single", "mods", "cfg", "doc"],
     "replace_paths": [("*", f"{full_version}:")],
 }
 executables = [
     Executable("soundrts.py", base="Win32GUI"),
     Executable("server.py", base=None),
 ]
 
-buildmultimapslist.build()
 builddoc.build()
 if os.path.exists(destination):
     print(f"{destination} already exists. Deleting...")