From c16400fa470cab8943fd76cab357cc129e8a1604 Mon Sep 17 00:00:00 2001
From: phobos2077 <phobos2077@gmail.com>
Date: Mon, 8 May 2023 23:40:47 +0200
Subject: [PATCH] Fix traps scene pids and compile gl_apcost

---
 root/data/scripts/gl_apcost.int     | Bin 0 -> 1828 bytes
 root/data/scripts/gl_traps.int      | Bin 14174 -> 14174 bytes
 root/data/scripts/test2.int         | Bin 14950 -> 14950 bytes
 scripts_src/_pbs_headers/ecco.h     |  12 ++++++------
 scripts_src/_pbs_main/gl_apcost.ssl |   8 ++++----
 5 files changed, 10 insertions(+), 10 deletions(-)
 create mode 100644 root/data/scripts/gl_apcost.int

diff --git a/root/data/scripts/gl_apcost.int b/root/data/scripts/gl_apcost.int
new file mode 100644
index 0000000000000000000000000000000000000000..4d63580f9d7fe2369a93756720fbf04f2616d4bc
GIT binary patch
literal 1828
zcma)6J8#oa6h3xr2bHu62?LZ0L4gWdl+f}}K@3!gu2jH)7_i*Lv}yB_?J#vXj+hZJ
zGVlvfVM1&m27Uu#1|cCf7KTW0?!Cviwvtp>y1D25`c5vI9}NH~;iR~YPiSEgr||@x
zlXPb3oWj$12It7iqT|p>ea0VV9;SpuYWd5o+}dJ(H!F8mnSTq#O6DW^;YPdR)`Q+g
z=spU3-|dBd2rwh0y|x#${JI-<{aV9ox?U7{wQbTCg*Nb;9k1@zI$=Z-uPX?5(`(n8
zen4>x6sWVl<wlK`4=}-;*9Dkjy4LBn$rVb9@3d3iP8fMX1b^uxiwMjGfZ1B7weCd~
zO1`tQcJub#dpkpQ&kx&-?c(^bZMr9s8_!Dw;eUQHC#;-Rv~Xd(y@(orQ+ixv%FvXl
zsT?i}tK2JTYha0ema!@*^9#$D<XymvcudNl;t{-sRh-V~C$)Zer2Zi3Wn8eNAK(Y}
z|IPd|UXzr?b=_yZ%6}+{pPL#Pzohk*k@~XEZ*xACe+9?oS97tD@=K&Hss3|MD1Oqt
ziAzaW!j3k{z^myltP7Ge^>nW&dzKsQ<>=~vjjTSet4|{FlsHaKXV+6^iHX<y8<~pk
zFt^ti<AO`^cc}xM#G^Qm=dge?@}Ajm<EU%cf8#_{rxKr4y%Y6DNQ!_rczQI4__@r@
zTWL?@Pv%R=leZ@_vq^fkP*|uQ)c?rFvhcMxWdsnjPa|lrr4Y0=G9_eeK)tFwVf!)i
z#>!}kbikZK9gzPu_E#xSYBP1rL_+(-d(NHG#;6!%5x)@L_8^n7-rr7g_1Eydq=Au2
zs!z6#JBPh&Wj#kZ6Bvtaz7W^3`i%0!MEqK1!LsBl%p1%<VBS=7c0RK;%~|XM^(<cs
v=Ur;f5(Ro~e&A)s>VUL1`|IM)7bKT{g;b0|26MUnjHN<cVP&W&qq_SCxren0

literal 0
HcmV?d00001

diff --git a/root/data/scripts/gl_traps.int b/root/data/scripts/gl_traps.int
index 8955ce41a3d4510e4896e5355039becba21cc0f0..491d57d09f6385c858142a64c14c7e3fc81fb1ca 100644
GIT binary patch
delta 167
zcmcbYcQ0?l7wI5Q`KIs&%L9xI3=HfC7?~J272tdhFkcbQ=LGYW;CwDHUm4El2J=-m
zyUCnkV&YVoEF!PN#3?`72|^XfyD}<G-Ui|*PJRNR3gks6t1B2Vs!Rs4aup;PmBFmp
LAlBwB3ai8bq%A1%

delta 167
zcmcbYcQ0?l7wI65zfIu{mIoLa7#P?OFfuW4{Dbp3!2JJkJ|~FJ$pGhbf%%MZJ~x=p
zwAoGO3=<Q_zsVx<I!qjYCp$r?0(n<PhRNGNod1)bK&S$F(aGux28>LTL9AQ_2}VXR
NYc`0rd5gj-F#yQvF6#gQ

diff --git a/root/data/scripts/test2.int b/root/data/scripts/test2.int
index bcf3f400891f07525548cf9c045e4a20d546cf0b..f53db7d1de59e15eb2350900a62b02aeaaba0c15 100644
GIT binary patch
delta 67
zcmaD>@~mXT6+R|Tg~`|WbeK5hC$sQ_DI<PYMy1IWAdceXWf1BLP)udAlz=Xy@?;MX
Kxw%Z>gC+ozSrP>R

delta 67
zcmaD>@~mXT6+R}8f0M8A=`eBpoy@`yri}Pq85t&5fH?mrFN085fMQIOr37>t87F&y
K$jxN}A2b0y9~I63

diff --git a/scripts_src/_pbs_headers/ecco.h b/scripts_src/_pbs_headers/ecco.h
index 1f86451..187c139 100644
--- a/scripts_src/_pbs_headers/ecco.h
+++ b/scripts_src/_pbs_headers/ecco.h
@@ -77,12 +77,12 @@
 #define PID_PBS_SHOTGUN_BUCKS       (641)
 
 // new scenery
-#define PID_PBS_SPIKE_TRAP_DISARMED  (0x02000000 + 2301)
-#define PID_PBS_SPIKE_TRAP           (0x02000000 + 2302)
-#define PID_PBS_MINE_DISARMED        (0x02000000 + 2303)
-#define PID_PBS_MINE                 (0x02000000 + 2304)
-#define PID_PBS_SENSOR_MINE_DISARMED (0x02000000 + 2305)
-#define PID_PBS_SENSOR_MINE          (0x02000000 + 2306)
+#define PID_PBS_SPIKE_TRAP_DISARMED  (0x02000000 + 2335)
+#define PID_PBS_SPIKE_TRAP           (0x02000000 + 2336)
+#define PID_PBS_MINE_DISARMED        (0x02000000 + 2337)
+#define PID_PBS_MINE                 (0x02000000 + 2338)
+#define PID_PBS_SENSOR_MINE_DISARMED (0x02000000 + 2339)
+#define PID_PBS_SENSOR_MINE          (0x02000000 + 2340)
 // some old scenery
 #define PID_STEAM                   (0x020004A4)
 #define PID_STEAM_2                 (0x0200073B)
diff --git a/scripts_src/_pbs_main/gl_apcost.ssl b/scripts_src/_pbs_main/gl_apcost.ssl
index d4e7b78..0a43f1f 100644
--- a/scripts_src/_pbs_main/gl_apcost.ssl
+++ b/scripts_src/_pbs_main/gl_apcost.ssl
@@ -12,10 +12,10 @@
 
 */
 
-#include "sfall.h"
-#include "mod.h"
-#include "lib.inven.h"
-#include "lib.math.h"
+#include "../sfall/sfall.h"
+#include "../sfall/lib.inven.h"
+#include "../sfall/lib.math.h"
+#include "../_pbs_headers/ecco.h"
 
 #define ITEM_USE_COST   (2)