aboutsummaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorXavier Del Campo Romero <xavi.dcr@tutanota.com>2024-01-28 03:01:13 +0100
committerXavier Del Campo Romero <xavi.dcr@tutanota.com>2024-01-28 15:17:49 +0100
commitfd53c7da8c5f2b79b87f624e313ff508072361ad (patch)
treedb569413cd3d42034a22368a7980aa99d7d55235 /res
parente49e3073c67af785447ddb0ecbdc521b68cf3ea9 (diff)
downloadjancity-fd53c7da8c5f2b79b87f624e313ff508072361ad.tar.gz
Big rushed update
Diffstat (limited to 'res')
-rw-r--r--res/CMakeLists.txt144
-rw-r--r--res/btn_left.bmpbin586 -> 0 bytes
-rw-r--r--res/btn_left_24.bmpbin2358 -> 1590 bytes
-rw-r--r--res/btn_mid.bmpbin542 -> 0 bytes
-rw-r--r--res/btn_mid_24.bmpbin2358 -> 1590 bytes
-rw-r--r--res/btn_right.bmpbin586 -> 0 bytes
-rw-r--r--res/btn_right_24.bmpbin2358 -> 1590 bytes
-rw-r--r--res/btn_small.bmpbin0 -> 490 bytes
-rw-r--r--res/btn_small_24.bmpbin0 -> 1782 bytes
-rw-r--r--res/car1_24.bmpbin0 -> 9270 bytes
-rw-r--r--res/car2_24.bmpbin0 -> 9270 bytes
-rw-r--r--res/checkbox_24.bmpbin0 -> 1998 bytes
-rw-r--r--res/city1.txt44
-rw-r--r--res/font.bmpbin0 -> 8206 bytes
-rw-r--r--res/font_24.bmpbin0 -> 48438 bytes
-rw-r--r--res/functions.cmake2
-rw-r--r--res/line_edit_left_24.bmpbin0 -> 1590 bytes
-rw-r--r--res/line_edit_mid_24.bmpbin0 -> 1590 bytes
-rw-r--r--res/line_edit_right_24.bmpbin0 -> 1590 bytes
-rw-r--r--res/sel_down_left_24.bmpbin0 -> 822 bytes
-rw-r--r--res/sel_down_right_24.bmpbin0 -> 822 bytes
-rw-r--r--res/sel_mid_down_24.bmpbin0 -> 822 bytes
-rw-r--r--res/sel_mid_top_24.bmpbin0 -> 150 bytes
-rw-r--r--res/sel_mid_v_24.bmpbin0 -> 182 bytes
-rw-r--r--res/sel_up_left_24.bmpbin0 -> 822 bytes
-rw-r--r--res/sel_up_right_24.bmpbin0 -> 822 bytes
-rw-r--r--res/unit5_24.bmpbin9270 -> 9270 bytes
27 files changed, 173 insertions, 17 deletions
diff --git a/res/CMakeLists.txt b/res/CMakeLists.txt
index 65f1ccd..e063d17 100644
--- a/res/CMakeLists.txt
+++ b/res/CMakeLists.txt
@@ -128,10 +128,143 @@ sprite(NAME unit6
CY 48
TRANSPARENT TRUE)
+sprite(NAME sel_down_left
+ X 384
+ Y 0
+ BPP 4
+ CX 0
+ CY 0
+ TRANSPARENT TRUE)
+
+sprite(NAME sel_down_right
+ X 384
+ Y 0
+ BPP 4
+ CX 0
+ CY 0
+ TRANSPARENT TRUE)
+
+sprite(NAME sel_mid_down
+ X 384
+ Y 0
+ BPP 4
+ CX 0
+ CY 0
+ TRANSPARENT TRUE)
+
+sprite(NAME sel_mid_top
+ X 384
+ Y 0
+ BPP 4
+ CX 0
+ CY 0
+ TRANSPARENT TRUE)
+
+sprite(NAME sel_mid_v
+ X 384
+ Y 0
+ BPP 4
+ CX 0
+ CY 0
+ TRANSPARENT TRUE)
+
+sprite(NAME sel_up_left
+ X 384
+ Y 0
+ BPP 4
+ CX 0
+ CY 0
+ TRANSPARENT TRUE)
+
+sprite(NAME sel_up_right
+ X 384
+ Y 0
+ BPP 4
+ CX 0
+ CY 0
+ TRANSPARENT TRUE)
+
+sprite(NAME checkbox
+ X 384
+ Y 0
+ BPP 4
+ CX 0
+ CY 0
+ TRANSPARENT TRUE)
+
+sprite(NAME line_edit_left
+ X 0
+ Y 0
+ BPP 4
+ CX 0
+ CY 0
+ TRANSPARENT TRUE)
+
+sprite(NAME line_edit_mid
+ X 0
+ Y 0
+ BPP 4
+ CX 0
+ CY 0
+ TRANSPARENT FALSE)
+
+sprite(NAME line_edit_right
+ X 0
+ Y 0
+ BPP 4
+ CX 0
+ CY 0
+ TRANSPARENT TRUE)
+
+sprite(NAME car1
+ X 0
+ Y 0
+ BPP 4
+ CX 0
+ CY 0
+ TRANSPARENT TRUE)
+
+sprite(NAME pavement
+ X 0
+ Y 0
+ BPP 4
+ CX 0
+ CY 0
+ TRANSPARENT FALSE)
+
+sprite(NAME car2
+ X 0
+ Y 0
+ BPP 4
+ CX 0
+ CY 0
+ TRANSPARENT TRUE)
+
+sprite(NAME building1
+ X 0
+ Y 0
+ BPP 4
+ CX 0
+ CY 0
+ TRANSPARENT TRUE)
+
+sprite(NAME building2
+ X 0
+ Y 0
+ BPP 4
+ CX 0
+ CY 0
+ TRANSPARENT TRUE)
+
level(NAME city1)
container(NAME jancity
SPRITES
+ building1
+ building2
+ car1
+ car2
+ checkbox
grass
sidewalk
roof1
@@ -148,4 +281,15 @@ container(NAME jancity
unit4
unit5
unit6
+ sel_down_left
+ sel_down_right
+ sel_mid_down
+ sel_mid_top
+ sel_mid_v
+ sel_up_left
+ sel_up_right
+ line_edit_left
+ line_edit_mid
+ line_edit_right
+ pavement
)
diff --git a/res/btn_left.bmp b/res/btn_left.bmp
deleted file mode 100644
index 7d8ee4e..0000000
--- a/res/btn_left.bmp
+++ /dev/null
Binary files differ
diff --git a/res/btn_left_24.bmp b/res/btn_left_24.bmp
index 36e2370..2ab8bf0 100644
--- a/res/btn_left_24.bmp
+++ b/res/btn_left_24.bmp
Binary files differ
diff --git a/res/btn_mid.bmp b/res/btn_mid.bmp
deleted file mode 100644
index 801e0d5..0000000
--- a/res/btn_mid.bmp
+++ /dev/null
Binary files differ
diff --git a/res/btn_mid_24.bmp b/res/btn_mid_24.bmp
index f7a0ca0..fb2e82f 100644
--- a/res/btn_mid_24.bmp
+++ b/res/btn_mid_24.bmp
Binary files differ
diff --git a/res/btn_right.bmp b/res/btn_right.bmp
deleted file mode 100644
index ae7cc85..0000000
--- a/res/btn_right.bmp
+++ /dev/null
Binary files differ
diff --git a/res/btn_right_24.bmp b/res/btn_right_24.bmp
index 26da50f..c56b308 100644
--- a/res/btn_right_24.bmp
+++ b/res/btn_right_24.bmp
Binary files differ
diff --git a/res/btn_small.bmp b/res/btn_small.bmp
new file mode 100644
index 0000000..43dacf6
--- /dev/null
+++ b/res/btn_small.bmp
Binary files differ
diff --git a/res/btn_small_24.bmp b/res/btn_small_24.bmp
new file mode 100644
index 0000000..0f19504
--- /dev/null
+++ b/res/btn_small_24.bmp
Binary files differ
diff --git a/res/car1_24.bmp b/res/car1_24.bmp
new file mode 100644
index 0000000..cb7475f
--- /dev/null
+++ b/res/car1_24.bmp
Binary files differ
diff --git a/res/car2_24.bmp b/res/car2_24.bmp
new file mode 100644
index 0000000..6ca8f3d
--- /dev/null
+++ b/res/car2_24.bmp
Binary files differ
diff --git a/res/checkbox_24.bmp b/res/checkbox_24.bmp
new file mode 100644
index 0000000..00bfe00
--- /dev/null
+++ b/res/checkbox_24.bmp
Binary files differ
diff --git a/res/city1.txt b/res/city1.txt
index 35aa10f..88ec6cc 100644
--- a/res/city1.txt
+++ b/res/city1.txt
@@ -1,21 +1,31 @@
-24 16
+24 24
-0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000
-0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000
-0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000
-0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000
+0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00
+0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00
+0009 0009 0009 0009 0009 0009 0009 0009 0009 0009 0009 0009 0009 0009 0009 0009 0009 0009 0009 0009 0009 0009 0009 0009
+0011 0011 0011 0011 0011 0011 0011 0011 0011 0011 0011 0011 0011 0011 0011 0011 0011 0011 0011 0011 0011 0011 0011 0011
-0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000
-0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000
-0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000
-0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000
+0053 0054 0054 0054 0054 0054 0054 0054 0053 0054 0054 0054 0054 0054 0054 0054 0054 0054 0054 0053 0054 0054 0054 0054
+0048 0049 0049 0049 0049 0049 0049 0049 0048 0049 0049 0049 0049 0049 0049 0049 0049 0049 0049 0048 0049 0049 0049 0049
+0055 0056 0056 0056 0056 0056 0056 0056 0055 0056 0056 0056 0056 0056 0056 0056 0050 005e 0051 0055 0056 0056 0056 0056
+0001 0001 0001 0001 0001 0001 0001 0001 0001 0001 0001 0001 0001 0001 0001 0002 004a 004b 004c 0000 0001 0001 0001 0001
-0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000
-0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000
-0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000
-0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000
+0009 0009 0009 0009 0009 0009 0009 0009 0009 0009 0009 0009 0009 0009 0009 000a 0057 0058 0059 0008 0000 0000 0000 0000
+0030 0031 0031 0032 0000 0000 0000 0000 0030 0031 0031 0032 0000 0000 0009 000a 0057 0058 0059 0008 0000 0000 0000 0000
+0038 0039 0039 003a 0000 0000 0000 0000 0038 0039 0039 003a 0000 0000 0009 000a 0057 0058 0059 0008 0000 0000 0000 0000
+0040 0041 0041 0042 0000 0000 0000 0000 0040 0041 0041 0042 0000 0000 0009 000a 0057 0058 0059 0008 0000 0000 0000 0000
-0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000
-0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000
-0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000
-0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000
+0062 0063 0064 0062 0a00 0a00 0a00 0a00 0062 0063 0064 0062 0a00 0a00 0a00 0a00 0057 0058 0059 0008 0a00 0a00 0a00 0a00
+0069 006a 006c 0069 0a00 0a00 0a00 0a00 0069 006a 006c 0069 0a00 0a00 0a00 0a00 0057 0058 0059 0008 0a00 0a00 0a00 0a00
+0070 0071 0073 0070 0a00 0a00 0a00 0a00 0070 0071 0073 0070 0a00 0a00 0a00 0a00 0057 0058 0059 0008 0a00 0a00 0a00 0a00
+0077 0078 007a 0077 0a00 0a00 0a00 0a00 0077 0078 007a 0077 0a00 0a00 0a00 0a00 0057 0058 0059 0008 0a00 0a00 0a00 0a00
+
+0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00
+0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00
+0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00
+0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00
+
+0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00
+0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00
+0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00
+0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00 0a00
diff --git a/res/font.bmp b/res/font.bmp
new file mode 100644
index 0000000..7fc1c36
--- /dev/null
+++ b/res/font.bmp
Binary files differ
diff --git a/res/font_24.bmp b/res/font_24.bmp
new file mode 100644
index 0000000..b12a8ce
--- /dev/null
+++ b/res/font_24.bmp
Binary files differ
diff --git a/res/functions.cmake b/res/functions.cmake
index 723e922..2a7e7c3 100644
--- a/res/functions.cmake
+++ b/res/functions.cmake
@@ -35,6 +35,7 @@ function(sprite)
VERBATIM)
add_custom_target(${SPRITE_NAME}_img
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${SPRITE_NAME})
+ add_dependencies(${PROJECT_NAME} ${SPRITE_NAME}_img)
add_dependencies(${SPRITE_NAME}_img tools)
endif()
endfunction()
@@ -73,6 +74,7 @@ function(sound)
VERBATIM)
add_custom_target(${SOUND_NAME}_snd
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${SOUND_NAME})
+ add_dependencies(${PROJECT_NAME} ${SOUND_NAME}_snd)
add_dependencies(${SOUND_NAME}_snd tools)
endif()
endfunction()
diff --git a/res/line_edit_left_24.bmp b/res/line_edit_left_24.bmp
new file mode 100644
index 0000000..dd977f6
--- /dev/null
+++ b/res/line_edit_left_24.bmp
Binary files differ
diff --git a/res/line_edit_mid_24.bmp b/res/line_edit_mid_24.bmp
new file mode 100644
index 0000000..ca934a0
--- /dev/null
+++ b/res/line_edit_mid_24.bmp
Binary files differ
diff --git a/res/line_edit_right_24.bmp b/res/line_edit_right_24.bmp
new file mode 100644
index 0000000..f9cf4e0
--- /dev/null
+++ b/res/line_edit_right_24.bmp
Binary files differ
diff --git a/res/sel_down_left_24.bmp b/res/sel_down_left_24.bmp
new file mode 100644
index 0000000..98caa7f
--- /dev/null
+++ b/res/sel_down_left_24.bmp
Binary files differ
diff --git a/res/sel_down_right_24.bmp b/res/sel_down_right_24.bmp
new file mode 100644
index 0000000..01db4c2
--- /dev/null
+++ b/res/sel_down_right_24.bmp
Binary files differ
diff --git a/res/sel_mid_down_24.bmp b/res/sel_mid_down_24.bmp
new file mode 100644
index 0000000..20a2f71
--- /dev/null
+++ b/res/sel_mid_down_24.bmp
Binary files differ
diff --git a/res/sel_mid_top_24.bmp b/res/sel_mid_top_24.bmp
new file mode 100644
index 0000000..79c3a5b
--- /dev/null
+++ b/res/sel_mid_top_24.bmp
Binary files differ
diff --git a/res/sel_mid_v_24.bmp b/res/sel_mid_v_24.bmp
new file mode 100644
index 0000000..e9093ae
--- /dev/null
+++ b/res/sel_mid_v_24.bmp
Binary files differ
diff --git a/res/sel_up_left_24.bmp b/res/sel_up_left_24.bmp
new file mode 100644
index 0000000..65cb7d3
--- /dev/null
+++ b/res/sel_up_left_24.bmp
Binary files differ
diff --git a/res/sel_up_right_24.bmp b/res/sel_up_right_24.bmp
new file mode 100644
index 0000000..2bdefd3
--- /dev/null
+++ b/res/sel_up_right_24.bmp
Binary files differ
diff --git a/res/unit5_24.bmp b/res/unit5_24.bmp
index 5d9225a..5447f6e 100644
--- a/res/unit5_24.bmp
+++ b/res/unit5_24.bmp
Binary files differ
generated by cgit v1.2.3 (git 2.39.1) at 2026-06-11 23:10:38 +0000