tAll cop messages now identified with AI codes - vaccinewars - be a doctor and … | |
git clone git://src.adamsgaard.dk/vaccinewars | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 94cb8fc2c3b3996a544bd1c61f4c7a8d6e80d46d | |
parent 30c5bd5c6106d0bea007fdb13015c48de2ec3111 | |
Author: Ben Webb <[email protected]> | |
Date: Wed, 13 Sep 2000 00:59:11 +0000 | |
All cop messages now identified with AI codes | |
Diffstat: | |
M TODO | 3 ++- | |
M intl/Makefile | 6 +++--- | |
M po/dopewars.pot | 116 +++++++++++++++--------------- | |
M src/message.h | 3 ++- | |
M src/serverside.c | 10 ++++++---- | |
5 files changed, 71 insertions(+), 67 deletions(-) | |
--- | |
diff --git a/TODO b/TODO | |
t@@ -1,6 +1,7 @@ | |
- Ignore "To" message field in client, and "From" field in server; use | |
A_PLAYERID ability to replace player names in protocol with player IDs | |
-- Fix GTK+ modal dialog behaviour (mouse grabbing during fighting) | |
+- Fix GTK+ modal dialog behaviour (mouse grabbing during fighting) - _seems_ | |
+ to be OK... | |
- Revamp player-player fighting | |
- Display purchase price of drugs? | |
- Increase cops' toughness - they should kill a bitch in 50-70% of encounters | |
diff --git a/intl/Makefile b/intl/Makefile | |
t@@ -25,7 +25,7 @@ srcdir = . | |
top_srcdir = .. | |
top_builddir = .. | |
-prefix = /usr | |
+prefix = /usr/local | |
exec_prefix = ${prefix} | |
transform = s,x,x, | |
libdir = $(exec_prefix)/lib | |
t@@ -51,8 +51,8 @@ RANLIB = ranlib | |
DEFS = -DLOCALEDIR=\"$(localedir)\" -DGNULOCALEDIR=\"$(gnulocaledir)\" \ | |
-DLOCALE_ALIAS_PATH=\"$(aliaspath)\" -DHAVE_CONFIG_H | |
CPPFLAGS = | |
-CFLAGS = -g -O2 -I/usr/local/lib/glib/include -I/usr/local/include -Wall -DDAT… | |
-LDFLAGS = -L/usr/local/lib -lglib | |
+CFLAGS = -g -O2 -I/usr/lib/glib/include -Wall -DDATADIR=\"${prefix}/share\" | |
+LDFLAGS = -L/usr/lib -lglib | |
COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) | |
diff --git a/po/dopewars.pot b/po/dopewars.pot | |
t@@ -6,7 +6,7 @@ | |
msgid "" | |
msgstr "" | |
"Project-Id-Version: PACKAGE VERSION\n" | |
-"POT-Creation-Date: 2000-09-12 18:35+0100\n" | |
+"POT-Creation-Date: 2000-09-13 01:58+0100\n" | |
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | |
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | |
"Language-Team: LANGUAGE <[email protected]>\n" | |
t@@ -2240,263 +2240,263 @@ msgstr "" | |
msgid "YN^^^^Do you pay a doctor %s to sew you up?" | |
msgstr "" | |
-#: src/serverside.c:1357 | |
+#: src/serverside.c:1358 | |
msgid "^You got one, man!" | |
msgstr "" | |
-#: src/serverside.c:1360 | |
+#: src/serverside.c:1361 | |
msgid "^You missed!" | |
msgstr "" | |
-#: src/serverside.c:1364 | |
+#: src/serverside.c:1365 | |
msgid "^He's firing on you, man! " | |
msgstr "" | |
-#: src/serverside.c:1366 | |
+#: src/serverside.c:1367 | |
msgid "^They're firing on you, man! " | |
msgstr "" | |
-#: src/serverside.c:1369 | |
+#: src/serverside.c:1370 | |
msgid "You've been hit! " | |
msgstr "" | |
-#: src/serverside.c:1376 | |
+#: src/serverside.c:1377 | |
msgid "He wasted you, man! What a drag!" | |
msgstr "" | |
-#: src/serverside.c:1378 | |
+#: src/serverside.c:1379 | |
msgid "They wasted you, man! What a drag!" | |
msgstr "" | |
-#: src/serverside.c:1386 | |
+#: src/serverside.c:1387 | |
#, c-format | |
msgid "You lost one of your %s!" | |
msgstr "" | |
-#: src/serverside.c:1395 | |
+#: src/serverside.c:1396 | |
msgid "He missed!" | |
msgstr "" | |
-#: src/serverside.c:1397 | |
+#: src/serverside.c:1398 | |
msgid "They missed!" | |
msgstr "" | |
-#: src/serverside.c:1417 | |
+#: src/serverside.c:1418 | |
msgid "You were mugged in the subway!" | |
msgstr "" | |
-#: src/serverside.c:1428 | |
+#: src/serverside.c:1429 | |
#, c-format | |
msgid "You meet a friend! He gives you %d %s." | |
msgstr "" | |
-#: src/serverside.c:1433 | |
+#: src/serverside.c:1434 | |
#, c-format | |
msgid "You meet a friend! You give him %d %s." | |
msgstr "" | |
-#: src/serverside.c:1440 | |
+#: src/serverside.c:1441 | |
msgid "Sanitized away a RandomOffer" | |
msgstr "" | |
-#: src/serverside.c:1445 | |
+#: src/serverside.c:1446 | |
#, c-format | |
msgid "" | |
"Police dogs chase you for %d blocks! You dropped some %s! That's a drag, man!" | |
msgstr "" | |
-#: src/serverside.c:1459 | |
+#: src/serverside.c:1460 | |
#, c-format | |
msgid "You find %d %s on a dead dude in the subway!" | |
msgstr "" | |
-#: src/serverside.c:1471 | |
+#: src/serverside.c:1472 | |
#, c-format | |
msgid "Your mama made brownies with some of your %s! They were great!" | |
msgstr "" | |
-#: src/serverside.c:1479 | |
+#: src/serverside.c:1480 | |
msgid "" | |
"YN^There is some weed that smells like paraquat here!^It looks good! Will " | |
"you smoke it? " | |
msgstr "" | |
-#: src/serverside.c:1486 | |
+#: src/serverside.c:1487 | |
#, c-format | |
msgid "You stopped to %s." | |
msgstr "" | |
-#: src/serverside.c:1507 | |
+#: src/serverside.c:1508 | |
#, c-format | |
msgid "Would you like to buy a bigger trenchcoat for %s?" | |
msgstr "" | |
-#: src/serverside.c:1512 | |
+#: src/serverside.c:1513 | |
#, c-format | |
msgid "YN^Hey dude! I'll help carry your %s for a mere %s. Yes or no?" | |
msgstr "" | |
-#: src/serverside.c:1524 | |
+#: src/serverside.c:1525 | |
#, c-format | |
msgid "YN^Would you like to buy a %s for %s?" | |
msgstr "" | |
-#: src/serverside.c:1625 src/serverside.c:1736 | |
+#: src/serverside.c:1626 src/serverside.c:1737 | |
#, c-format | |
msgid "%s: offer was on behalf of %s" | |
msgstr "" | |
-#: src/serverside.c:1628 | |
+#: src/serverside.c:1629 | |
#, c-format | |
msgid "%s has accepted your %s!^Use the G key to contact your spy." | |
msgstr "" | |
-#: src/serverside.c:1674 | |
+#: src/serverside.c:1675 | |
msgid "" | |
"You hallucinated for three days on the wildest trip you ever imagined!^Then " | |
"you died because your brain disintegrated!" | |
msgstr "" | |
-#: src/serverside.c:1713 | |
+#: src/serverside.c:1714 | |
#, c-format | |
msgid "Too late - %s has just left!" | |
msgstr "" | |
-#: src/serverside.c:1739 | |
+#: src/serverside.c:1740 | |
#, c-format | |
msgid "%s has rejected your %s!" | |
msgstr "" | |
-#: src/serverside.c:1774 | |
+#: src/serverside.c:1775 | |
#, c-format | |
msgid "%s has got away!" | |
msgstr "" | |
-#: src/serverside.c:1815 | |
+#: src/serverside.c:1816 | |
#, c-format | |
msgid "%s has run off!" | |
msgstr "" | |
-#: src/serverside.c:1827 | |
+#: src/serverside.c:1828 | |
msgid "Coward! You successfully escaped from the fight." | |
msgstr "" | |
-#: src/serverside.c:1883 | |
+#: src/serverside.c:1884 | |
msgid "pitifully armed" | |
msgstr "" | |
-#: src/serverside.c:1884 | |
+#: src/serverside.c:1885 | |
msgid "lightly armed" | |
msgstr "" | |
-#: src/serverside.c:1885 | |
+#: src/serverside.c:1886 | |
msgid "moderately well armed" | |
msgstr "" | |
-#: src/serverside.c:1886 | |
+#: src/serverside.c:1887 | |
msgid "heavily armed" | |
msgstr "" | |
-#: src/serverside.c:1887 | |
+#: src/serverside.c:1888 | |
msgid "armed to the teeth" | |
msgstr "" | |
-#: src/serverside.c:1888 | |
+#: src/serverside.c:1889 | |
msgid " fires and " | |
msgstr "" | |
-#: src/serverside.c:1889 | |
+#: src/serverside.c:1890 | |
msgid " stands and takes it." | |
msgstr "" | |
-#: src/serverside.c:1892 | |
+#: src/serverside.c:1893 | |
#, c-format | |
msgid "%s arrives, with %d %s, %s,^%s" | |
msgstr "" | |
-#: src/serverside.c:1896 | |
+#: src/serverside.c:1897 | |
#, c-format | |
msgid "%s arrives, %s,^%s" | |
msgstr "" | |
-#: src/serverside.c:1901 | |
+#: src/serverside.c:1902 | |
#, c-format | |
msgid "%s fires and " | |
msgstr "" | |
-#: src/serverside.c:1903 | |
+#: src/serverside.c:1904 | |
#, c-format | |
msgid "%s stands and takes it." | |
msgstr "" | |
-#: src/serverside.c:1915 | |
+#: src/serverside.c:1916 | |
msgid "misses you!" | |
msgstr "" | |
-#: src/serverside.c:1916 | |
+#: src/serverside.c:1917 | |
#, c-format | |
msgid "You failed to hit %s." | |
msgstr "" | |
-#: src/serverside.c:1919 | |
+#: src/serverside.c:1920 | |
msgid "You stand and take it." | |
msgstr "" | |
-#: src/serverside.c:1923 | |
+#: src/serverside.c:1924 | |
msgid "hits you, man!" | |
msgstr "" | |
-#: src/serverside.c:1926 | |
+#: src/serverside.c:1927 | |
msgid " You've been wasted! What a drag!" | |
msgstr "" | |
-#: src/serverside.c:1927 | |
+#: src/serverside.c:1928 | |
#, c-format | |
msgid "You hit and killed %s" | |
msgstr "" | |
-#: src/serverside.c:1942 src/serverside.c:1975 | |
+#: src/serverside.c:1943 src/serverside.c:1976 | |
msgid ", and loot the body!" | |
msgstr "" | |
-#: src/serverside.c:1951 | |
+#: src/serverside.c:1952 | |
#, c-format | |
msgid "^You lost a %s, man!" | |
msgstr "" | |
-#: src/serverside.c:1956 | |
+#: src/serverside.c:1957 | |
#, c-format | |
msgid "You are paid a bounty of %s in reward for killing^one of %s's %s" | |
msgstr "" | |
-#: src/serverside.c:1964 | |
+#: src/serverside.c:1965 | |
#, c-format | |
msgid "You killed one of %s's %s (%d left)" | |
msgstr "" | |
-#: src/serverside.c:1982 | |
+#: src/serverside.c:1983 | |
#, c-format | |
msgid "You fire, and hit %s!" | |
msgstr "" | |
-#: src/serverside.c:2021 | |
+#: src/serverside.c:2023 | |
msgid "YN^Officer %%s spots you dropping %s, and chases you!" | |
msgstr "" | |
-#: src/serverside.c:2023 | |
+#: src/serverside.c:2025 | |
msgid "" | |
"YN^Officer %%s and %%d of his deputies spot you dropping %s, and chase you!" | |
msgstr "" | |
-#: src/serverside.c:2178 | |
+#: src/serverside.c:2180 | |
msgid "Player removed due to idle timeout" | |
msgstr "" | |
-#: src/serverside.c:2188 | |
+#: src/serverside.c:2190 | |
msgid "Player removed due to connect timeout" | |
msgstr "" | |
-#: src/serverside.c:2194 src/serverside.c:2200 | |
+#: src/serverside.c:2196 src/serverside.c:2202 | |
#, c-format | |
msgid "%s fails to return fire..." | |
msgstr "" | |
diff --git a/src/message.h b/src/message.h | |
t@@ -75,7 +75,7 @@ | |
#define C_NONE 'A' | |
#define C_ASKLOAN 'B' | |
-#define C_COPS 'C' | |
+#define C_COPSMESG 'C' | |
#define C_ASKBITCH 'D' | |
#define C_ASKGUN 'E' | |
#define C_ASKGUNSHOP 'F' | |
t@@ -85,6 +85,7 @@ | |
#define C_ASKRUNFIGHT 'J' | |
#define C_ASKSEW 'K' | |
#define C_MEETPLAYER 'L' | |
+#define C_COPSDONE 'M' | |
#define DT_LOCATION 'A' | |
#define DT_DRUG 'B' | |
diff --git a/src/serverside.c b/src/serverside.c | |
t@@ -1306,7 +1306,7 @@ void FireAtHardass(Player *Play,char FireType) { | |
} else { | |
g_string_append(text,_("^You lose them in the alleys.")); | |
} | |
- SendPrintMessage(NULL,C_NONE,Play,text->str); | |
+ SendPrintMessage(NULL,C_COPSDONE,Play,text->str); | |
FinishFightWithHardass(Play,NULL); | |
g_string_free(text,TRUE); | |
return; | |
t@@ -1332,10 +1332,10 @@ void FireAtHardass(Player *Play,char FireType) { | |
Play->Cash += i; | |
Play->Flags |= DEADHARDASS; | |
SendPlayerData(Play); | |
- SendPrintMessage(NULL,C_NONE,Play,text->str); | |
Play->DocPrice=brandom(1000,2000-5*Play->Health); | |
if (brandom(0,100)<75 && Play->DocPrice<=Play->Cash && | |
Play->Health<100) { | |
+ SendPrintMessage(NULL,C_COPSMESG,Play,text->str); | |
Play->EventNum=E_DOCTOR; | |
if (Play->Bitches.Carried && !WantAntique) { | |
g_string_sprintf(text, | |
t@@ -1349,6 +1349,7 @@ void FireAtHardass(Player *Play,char FireType) { | |
g_free(prstr); | |
SendQuestion(NULL,C_ASKSEW,Play,text->str); | |
} else { | |
+ SendPrintMessage(NULL,C_COPSDONE,Play,text->str); | |
FinishFightWithHardass(Play,NULL); | |
} | |
g_string_free(text,TRUE); | |
t@@ -1398,7 +1399,7 @@ void FireAtHardass(Player *Play,char FireType) { | |
} | |
} | |
SendPlayerData(Play); | |
- SendPrintMessage(NULL,C_NONE,Play,text->str); | |
+ SendPrintMessage(NULL,C_COPSMESG,Play,text->str); | |
g_string_free(text,TRUE); | |
OfficerHardass(Play,NULL,NULL); | |
} | |
t@@ -2017,7 +2018,8 @@ void BuyObject(Player *From,char *data) { | |
From->Cash-=amount*From->Drugs[index].Price; | |
SendPlayerData(From); | |
- if (!Sanitized && (From->Drugs[index].Price==0 && brandom(0,100)<Cops… | |
+ if (!Sanitized && (From->Drugs[index].Price==0 && | |
+ brandom(0,100)<Cops.DropProb)) { | |
lone=g_strdup_printf(_("YN^Officer %%s spots you dropping %s, and " | |
"chases you!"),Names.Drugs); | |
deputy=g_strdup_printf(_("YN^Officer %%s and %%d of his deputies " |