From 7e57411eaa5e1deac15f6e0856fe847fe1f253cf Mon Sep 17 00:00:00 2001 From: Edo Date: Sat, 2 Mar 2024 16:12:51 +0100 Subject: [PATCH] build: use OAT to link my mod (#2) --- .github/workflows/link-linux.yml | 27 ++++++++++++++++++ LICENSE | 2 +- README.md | 25 ++++++++++------ raw/localizedstrings/MPUI_GTNW | 1 - raw/localizedstrings/MPUI_GTNW_RECIPE_DESC | 1 - raw/localizedstrings/MPUI_GTNW_RECIPE_NAME | 1 - raw/localizedstrings/OBJECTIVES_GTNW | 1 - raw/localizedstrings/PRESENCE_ARENA | 1 - raw/localizedstrings/PRESENCE_GTNW | 1 - .../arena/english/localizedstrings/mod.str | 23 +++++++++++++++ .../arena}/maps/mp/gametypes/_gametypes.txt | 0 .../arena}/maps/mp/gametypes/arena.gsc | 0 .../arena}/maps/mp/gametypes/arena.txt | 0 .../arena}/maps/mp/gametypes/gtnw.gsc | 0 .../arena}/maps/mp/gametypes/gtnw.txt | 0 zone_raw/arena/mod | 1 + {raw => zone_raw/arena}/mp/basemaps.arena | 0 .../arena}/mp/recipes/arena.recipe | Bin .../arena}/mp/recipes/gtnw.recipe | Bin .../arena/zone_source/arena.zone | 23 ++++++++------- 20 files changed, 80 insertions(+), 27 deletions(-) create mode 100644 .github/workflows/link-linux.yml delete mode 100644 raw/localizedstrings/MPUI_GTNW delete mode 100644 raw/localizedstrings/MPUI_GTNW_RECIPE_DESC delete mode 100644 raw/localizedstrings/MPUI_GTNW_RECIPE_NAME delete mode 100644 raw/localizedstrings/OBJECTIVES_GTNW delete mode 100644 raw/localizedstrings/PRESENCE_ARENA delete mode 100644 raw/localizedstrings/PRESENCE_GTNW create mode 100644 zone_raw/arena/english/localizedstrings/mod.str rename {raw => zone_raw/arena}/maps/mp/gametypes/_gametypes.txt (100%) rename {raw => zone_raw/arena}/maps/mp/gametypes/arena.gsc (100%) rename {raw => zone_raw/arena}/maps/mp/gametypes/arena.txt (100%) rename {raw => zone_raw/arena}/maps/mp/gametypes/gtnw.gsc (100%) rename {raw => zone_raw/arena}/maps/mp/gametypes/gtnw.txt (100%) create mode 100644 zone_raw/arena/mod rename {raw => zone_raw/arena}/mp/basemaps.arena (100%) rename {raw => zone_raw/arena}/mp/recipes/arena.recipe (100%) rename {raw => zone_raw/arena}/mp/recipes/gtnw.recipe (100%) rename raw/mod.csv => zone_raw/arena/zone_source/arena.zone (54%) diff --git a/.github/workflows/link-linux.yml b/.github/workflows/link-linux.yml new file mode 100644 index 0000000..92daf1a --- /dev/null +++ b/.github/workflows/link-linux.yml @@ -0,0 +1,27 @@ +name: link + +on: [push] + +jobs: + link-linux: + name: Link assets on Linux + runs-on: ubuntu-latest + + steps: + - name: Check out files + uses: actions/checkout@main + + - name: Setup OAT + uses: diamante0018/setup-oat@main + with: + version: "0.8.3" + + - name: Link assets + run: | + Linker -v arena + - name: Upload mod.ff + uses: actions/upload-artifact@main + with: + name: arena + path: | + zone_out/arena/mod.ff diff --git a/LICENSE b/LICENSE index de70cfc..fcd6518 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ BSD 3-Clause License -Copyright (c) 2022, Edoardo Sanguineti +Copyright (c) 2024, Edoardo Sanguineti All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/README.md b/README.md index 27e839f..c5abe9d 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,22 @@ -# PlutoIW5Arena +# PlutoIW5Arena: A mod for Plutonium.pw -Build a mod.ff archive using ZoneTool. -Place the ff archive in `%localappdata%/Plutonium/storage/iw5/mods/arena`. -Set `fs_game` Dvar to `mods/arena` +## Build -# Warning +- Build a mod.ff archive using [OpenAssetTools][oat-link]. +- Place the mod.ff archive in `%localappdata%/Plutonium/storage/iw5/mods/arena`. +- Set `fs_game` Dvar to `mods/arena` -You may need to place rawfiles inside an iwd to get plutonium to load them. +## Bonus -# Bonus GTNW has been added. Thanks to: -* [callanb](https://github.com/callanb) -* [ZoneTool](https://github.com/ZoneTool/zonetool) +* [callanb](callanb-link) + +* [ZoneTool](zonetool-link) + +* [Laupetin][laupetin-link] + +[oat-link]: https://openassettools.dev +[callanb-link]: https://github.com/callanb +[zonetool-link]: https://github.com/ZoneTool/zonetool +[laupetin-link]: https://github.com/Laupetin diff --git a/raw/localizedstrings/MPUI_GTNW b/raw/localizedstrings/MPUI_GTNW deleted file mode 100644 index 70d6677..0000000 --- a/raw/localizedstrings/MPUI_GTNW +++ /dev/null @@ -1 +0,0 @@ -Global Thermonuclear War \ No newline at end of file diff --git a/raw/localizedstrings/MPUI_GTNW_RECIPE_DESC b/raw/localizedstrings/MPUI_GTNW_RECIPE_DESC deleted file mode 100644 index f374732..0000000 --- a/raw/localizedstrings/MPUI_GTNW_RECIPE_DESC +++ /dev/null @@ -1 +0,0 @@ -Global thermonuclear war with fake nukes. \ No newline at end of file diff --git a/raw/localizedstrings/MPUI_GTNW_RECIPE_NAME b/raw/localizedstrings/MPUI_GTNW_RECIPE_NAME deleted file mode 100644 index 70d6677..0000000 --- a/raw/localizedstrings/MPUI_GTNW_RECIPE_NAME +++ /dev/null @@ -1 +0,0 @@ -Global Thermonuclear War \ No newline at end of file diff --git a/raw/localizedstrings/OBJECTIVES_GTNW b/raw/localizedstrings/OBJECTIVES_GTNW deleted file mode 100644 index 95d598d..0000000 --- a/raw/localizedstrings/OBJECTIVES_GTNW +++ /dev/null @@ -1 +0,0 @@ -Be the first to capture the Nuclear Strike crate to win. Made by Birchy & FutureRave. \ No newline at end of file diff --git a/raw/localizedstrings/PRESENCE_ARENA b/raw/localizedstrings/PRESENCE_ARENA deleted file mode 100644 index 752d2d6..0000000 --- a/raw/localizedstrings/PRESENCE_ARENA +++ /dev/null @@ -1 +0,0 @@ -Arena \ No newline at end of file diff --git a/raw/localizedstrings/PRESENCE_GTNW b/raw/localizedstrings/PRESENCE_GTNW deleted file mode 100644 index 2f34f7c..0000000 --- a/raw/localizedstrings/PRESENCE_GTNW +++ /dev/null @@ -1 +0,0 @@ -GTNW \ No newline at end of file diff --git a/zone_raw/arena/english/localizedstrings/mod.str b/zone_raw/arena/english/localizedstrings/mod.str new file mode 100644 index 0000000..de60ab3 --- /dev/null +++ b/zone_raw/arena/english/localizedstrings/mod.str @@ -0,0 +1,23 @@ +VERSION "1" +CONFIG "C:/trees/cod3/cod3/bin/StringEd.cfg" +FILENOTES "Arena mod" + +REFERENCE MPUI_GTNW +LANG_ENGLISH "Global Thermonuclear War" + +REFERENCE MPUI_GTNW_RECIPE_DESC +LANG_ENGLISH "Global thermonuclear war." + +REFERENCE MPUI_GTNW_RECIPE_NAME +LANG_ENGLISH "Global Thermonuclear War" + +REFERENCE OBJECTIVES_GTNW +LANG_ENGLISH "Be the first to capture the Nuclear Strike crate to win." + +REFERENCE PRESENCE_ARENA +LANG_ENGLISH "Arena" + +REFERENCE PRESENCE_GTNW +LANG_ENGLISH "GTNW" + +ENDMARKER diff --git a/raw/maps/mp/gametypes/_gametypes.txt b/zone_raw/arena/maps/mp/gametypes/_gametypes.txt similarity index 100% rename from raw/maps/mp/gametypes/_gametypes.txt rename to zone_raw/arena/maps/mp/gametypes/_gametypes.txt diff --git a/raw/maps/mp/gametypes/arena.gsc b/zone_raw/arena/maps/mp/gametypes/arena.gsc similarity index 100% rename from raw/maps/mp/gametypes/arena.gsc rename to zone_raw/arena/maps/mp/gametypes/arena.gsc diff --git a/raw/maps/mp/gametypes/arena.txt b/zone_raw/arena/maps/mp/gametypes/arena.txt similarity index 100% rename from raw/maps/mp/gametypes/arena.txt rename to zone_raw/arena/maps/mp/gametypes/arena.txt diff --git a/raw/maps/mp/gametypes/gtnw.gsc b/zone_raw/arena/maps/mp/gametypes/gtnw.gsc similarity index 100% rename from raw/maps/mp/gametypes/gtnw.gsc rename to zone_raw/arena/maps/mp/gametypes/gtnw.gsc diff --git a/raw/maps/mp/gametypes/gtnw.txt b/zone_raw/arena/maps/mp/gametypes/gtnw.txt similarity index 100% rename from raw/maps/mp/gametypes/gtnw.txt rename to zone_raw/arena/maps/mp/gametypes/gtnw.txt diff --git a/zone_raw/arena/mod b/zone_raw/arena/mod new file mode 100644 index 0000000..2d5958d --- /dev/null +++ b/zone_raw/arena/mod @@ -0,0 +1 @@ +Legalize Nuclear Bombs \ No newline at end of file diff --git a/raw/mp/basemaps.arena b/zone_raw/arena/mp/basemaps.arena similarity index 100% rename from raw/mp/basemaps.arena rename to zone_raw/arena/mp/basemaps.arena diff --git a/raw/mp/recipes/arena.recipe b/zone_raw/arena/mp/recipes/arena.recipe similarity index 100% rename from raw/mp/recipes/arena.recipe rename to zone_raw/arena/mp/recipes/arena.recipe diff --git a/raw/mp/recipes/gtnw.recipe b/zone_raw/arena/mp/recipes/gtnw.recipe similarity index 100% rename from raw/mp/recipes/gtnw.recipe rename to zone_raw/arena/mp/recipes/gtnw.recipe diff --git a/raw/mod.csv b/zone_raw/arena/zone_source/arena.zone similarity index 54% rename from raw/mod.csv rename to zone_raw/arena/zone_source/arena.zone index fa37ef0..dd04089 100644 --- a/raw/mod.csv +++ b/zone_raw/arena/zone_source/arena.zone @@ -1,24 +1,25 @@ -# Add gamemode +// Call Of Duty: Modern Warfare 3 +>game,IW5 +>name,mod + +localize,mod + +// Add custom gamemodes rawfile,maps/mp/gametypes/_gametypes.txt -# Gamemode scripts +// Gamemode scripts rawfile,maps/mp/gametypes/arena.gsc rawfile,maps/mp/gametypes/gtnw.gsc -# Copied from war.recipe +// Copied from war.recipe rawfile,mp/recipes/arena.recipe rawfile,mp/recipes/gtnw.recipe +// Maybe we don't need this rawfile,mp/basemaps.arena -# UI Loc strings +// UI Loc strings rawfile,maps/mp/gametypes/arena.txt rawfile,maps/mp/gametypes/gtnw.txt -# Loc -localize,PRESENCE_ARENA -localize,PRESENCE_GTNW -localize,MPUI_GTNW_RECIPE_NAME -localize,MPUI_GTNW_RECIPE_DESC -localize,MPUI_GTNW -localize,OBJECTIVES_GTNW +rawfile,mod