Skip to content

Commit 346f384

Browse files
committed
Add more menu settings. Use other language files format.
1 parent 17eebaa commit 346f384

9 files changed

+58
-10
lines changed

LANGUAGE.csv

-2
This file was deleted.

LANGUAGE.csv.bak

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
default,Identifier,Remarks,Filter,de,,Miscellaneous,,
2+
You feel a powerful presence in this place.,RAREMONSTERSPAWNED,,,Du spürst eine starke Präsenz an diesem Ort.
3+
Show affixes' names in stats,RWSETTINGS_AFFIXNAMES,,,Affix Namen anzeigen
4+
Too closely dropped items jump from each other,RWSETTINGS_UNCLUMP,,,Nebenen Artefakten vom einander springen

LANGUAGE.de

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
[de] //language code header
2+
3+
// Gameplay
4+
RAREMONSTERSPAWNED = "Du spürst eine starke Präsenz an diesem Ort.";
5+
6+
// Menu
7+
RWMENU_DOOMABLOSETTINGS = "DOOMablo anpassen";
8+
RWMENU_CUSTOMIZEDOOMABLO = "DOOMablo Einstellungen";
9+
10+
RWMENU_INTERFACEOPTIONS_HEADER = "Interfaceeinstellungen";
11+
RWMENU_GAMEPLAYOPTIONS_HEADER = "Gameplayeinstellungen";
12+
RWMENU_CONTROLS_HEADER = "DOOMablo Steuerung";
13+
14+
RWSETTINGS_AFFIXNAMES = "Affix Namen anzeigen";
15+
RWSETTINGS_UNCLUMP = "Nebenen Artefakten vom einander springen";
16+
RWSETTINGS_SCRAPITEMBTN = "Einen Artefakt verschrotten";

LANGUAGE.enu

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
[enu] //language code header
2+
3+
// Gameplay
4+
RAREMONSTERSPAWNED = "You feel a powerful presence in this place.";
5+
6+
// Menu
7+
RWMENU_DOOMABLOSETTINGS = "DOOMablo settings";
8+
RWMENU_CUSTOMIZEDOOMABLO = "Customize DOOMablo";
9+
10+
RWMENU_INTERFACEOPTIONS_HEADER = "Interface options";
11+
RWMENU_GAMEPLAYOPTIONS_HEADER = "Gameplay options";
12+
RWMENU_CONTROLS_HEADER = "DOOMablo Controls";
13+
14+
RWSETTINGS_AFFIXNAMES = "Show affixes' names in stats";
15+
RWSETTINGS_UNCLUMP = "Too closely dropped items jump from each other";
16+
RWSETTINGS_SCRAPITEMBTN = "Scrap item";

MENUDEF.txt

+13-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,22 @@
11
AddOptionMenu "OptionsMenu"
22
{
3-
StaticText ""
4-
Submenu "Configure DOOMablo", "RW_Options"
3+
StaticText "$RWMENU_DOOMABLOSETTINGS"
4+
Submenu "$RWMENU_CUSTOMIZEDOOMABLO", "RW_Options"
55
}
66

77
OptionMenu "RW_Options"
88
{
9-
Title "DOOMablo options"
10-
StaticText ""
11-
Option "Show affixes' names in stats", "RwSettingsShowAffixNamesInTables", "RwOptionsYesNo"
9+
Title "$RWMENU_DOOMABLOSETTINGS"
10+
StaticText "$RWMENU_INTERFACEOPTIONS_HEADER"
11+
Option "$RWSETTINGS_AFFIXNAMES", "RwSettingsShowAffixNamesInTables", "RwOptionsYesNo"
12+
13+
StaticText ""
14+
StaticText "$RWMENU_GAMEPLAYOPTIONS_HEADER"
15+
Option "$RWSETTINGS_UNCLUMP", "RwSettingsClumpedDropsJump", "RwOptionsYesNo"
16+
17+
StaticText ""
18+
StaticText "$RWMENU_CONTROLS_HEADER"
19+
Control "$RWSETTINGS_SCRAPITEMBTN", "+user1"
1220
}
1321

1422
OptionValue "RwOptionsYesNo"

cvarinfo.txt

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
server bool RwSettingsShowAffixNamesInTables = true;
2+
server bool RwSettingsClumpedDropsJump = true;

mapinfo.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ gameinfo
1111
AddEventHandlers = "AmmoDropsHandler"
1212
AddEventHandlers = "DropsHandler"
1313
AddEventHandlers = "ExperienceHandler"
14-
AddEventHandlers = "DroppedItemsSpreadHandler"
14+
AddEventHandlers = "DroppedItemsUnclumpHandler"
1515
AddEventHandlers = "MonstersAffixingHandler"
1616
AddEventHandlers = "ConsoleDropsHandler"
1717
AddEventHandlers = "PressToPickupHandler"

zscript.zsc

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ version "4.10.0"
4545
#include "zscript/drops/drops_handler.zs"
4646
#include "zscript/drops/drops_handler_progression.zs"
4747
#include "zscript/drops/drops_spawner.zs"
48-
#include "zscript/drops/dropped_items_spread_handler.zs"
48+
#include "zscript/drops/dropped_items_unclump_handler.zs"
4949
#include "zscript/drops/drop_spreadable.zs"
5050
#include "zscript/drops/console_drops_handler.zs"
5151
#include "zscript/drops/map_placed_items_replacements_handler.zs"

zscript/drops/dropped_items_spread_handler.zs zscript/drops/dropped_items_unclump_handler.zs

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Allows items to "jump" from other drops if too close.
2-
class DroppedItemsSpreadHandler : EventHandler
2+
class DroppedItemsUnclumpHandler : EventHandler
33
{
44
mixin DropSpreadable;
55

@@ -10,6 +10,11 @@ class DroppedItemsSpreadHandler : EventHandler
1010
if (currTick % TICRATE != 0) {
1111
return;
1212
}
13+
14+
if (!RwSettingsClumpedDropsJump) {
15+
return;
16+
}
17+
1318
let ti = ThinkerIterator.Create('Inventory');
1419
Inventory itm;
1520
while (itm = Inventory(ti.next())) {

0 commit comments

Comments
 (0)