Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat: french opening journal entry content #512

Merged
merged 111 commits into from
Aug 2, 2023
Merged

Feat: french opening journal entry content #512

Changes from 1 commit
Commits
Show all changes
111 commits
Select commit Hold shift + click to select a range
aff6e36
feat: transfering french content to my other compu
DZappala Jun 29, 2023
0577b66
fix: french content bugfixes
DZappala Jun 29, 2023
dca2389
fix: degaule not always ruler
DZappala Jun 29, 2023
11ef8fe
feat: more stuff to transfer to pc
DZappala Jun 30, 2023
1a1c96f
feat: scripted buttons for je
DZappala Jun 30, 2023
2f66c1b
feat: init event videos and aliases
DZappala Jul 1, 2023
e896b2e
feat: more france
DZappala Jul 1, 2023
ecc1aed
feat: more french events
DZappala Jul 3, 2023
f0b23e3
feat: more french journal entries
DZappala Jul 3, 2023
9582a61
feat: big debate event
DZappala Jul 3, 2023
3eb490e
fix: option weights
DZappala Jul 3, 2023
b362185
feat: a new constitution je completed
DZappala Jul 3, 2023
bdcc28e
fix: final outcomes of france chain
DZappala Jul 3, 2023
a9dc23e
fix: extended days
DZappala Jul 3, 2023
d3f6205
revert: extend days
DZappala Jul 3, 2023
0251586
fix: adjust weights of effects in JE
DZappala Jul 3, 2023
4155cc1
Merge branch 'dev' of https://github.com/Cold-War-Project/CWP-Main in…
DZappala Jul 4, 2023
e6aa5ec
feat: update spelling and grammar
DZappala Jul 4, 2023
0f58f6b
fix: add failsafe
DZappala Jul 4, 2023
4bf9702
fix: journal entry activated made into a toast
DZappala Jul 4, 2023
c42bb82
chore: formatting
DZappala Jul 4, 2023
610d2f1
chore: init alert files
DZappala Jul 4, 2023
a47df6e
chore: metadata
DZappala Jul 4, 2023
f87e522
chore: sp
DZappala Jul 4, 2023
75cf383
fix: alerts
DZappala Jul 4, 2023
8fcb42e
fix: france now starts as an oligarchy
DZappala Jul 4, 2023
d9797a7
breaking_change: administrations cant have voting
DZappala Jul 4, 2023
966dc19
fix: supporting a group now gives 3 instead of 1 support
DZappala Jul 4, 2023
a0e9061
feat: qol alerts
DZappala Jul 4, 2023
8365d7b
fix: incorrect event logic
DZappala Jul 4, 2023
b10c09d
fix: added accumulator
DZappala Jul 4, 2023
7944e3b
fix: france can't enact laws whilst writing a constitution
DZappala Jul 4, 2023
5b624c8
fix: end variable name
DZappala Jul 4, 2023
121a1e6
fix: localization
DZappala Jul 4, 2023
ee185bb
fix: degaulle is patriots
DZappala Jul 4, 2023
f9daa93
fix: accidentally duplicated event
DZappala Jul 4, 2023
e4ea931
fix: more JE balancing
DZappala Jul 4, 2023
89a17f9
fix: incorrect laws
DZappala Jul 4, 2023
82020f1
Merge branch 'dev' into french-content
Max200012 Jul 5, 2023
9f1edbb
Transfert of data between pc, unusable in its current state
ademblon Jul 6, 2023
bbfe28b
Changed De Gaulle's ig from securocrats to entrepreneurs. Tried editi…
BelHms Jul 6, 2023
77fadb8
Deleted Pierre Poujade as entrepreneurs ig leader.
BelHms Jul 6, 2023
327e59c
alpha 0.0.0.00.0.1 of new je for constitution
Jul 6, 2023
ae437cf
chore: moved out french party locs to other branch
Jul 6, 2023
76b2faf
Merge branch 'french-content' of https://github.com/Cold-War-Project/…
Jul 6, 2023
6095fdc
progress take account of ig's clout
Jul 6, 2023
1b23f62
Merge branch 'french-content' of github.com:Cold-War-Project/CWP-Main…
Jul 6, 2023
1df58b2
rebalance of weight
Jul 7, 2023
add42b1
Merge remote-tracking branch 'origin/french-content' into french-content
BelHms Jul 7, 2023
0c7c29c
Added "a new constitution" events localization and renamed parties_FR…
BelHms Jul 7, 2023
a2308d3
chore: fix loc file
Jul 7, 2023
7a0e576
Merge remote-tracking branch 'origin/french-content' into french-content
BelHms Jul 7, 2023
a77986e
Update Gaullist ideology (title, desc and head of government lawgroup)
BelHms Jul 7, 2023
ed6e9b2
Updated French party names.
BelHms Jul 7, 2023
40d474b
Changed France's ig leaders with names, birth dates, IGs, ideologies,…
BelHms Jul 8, 2023
0d0c55e
Changed a few of France's ig leaders' ideologies to moderate.
BelHms Jul 8, 2023
56b962d
Completed "a new constitution" events.
BelHms Jul 9, 2023
4606035
Added a few more characters, updated party names according to IG lead…
BelHms Jul 9, 2023
40b7e22
rebalance of weight
Jul 9, 2023
5d6bbad
Merge branch 'dev' into french-content
Jul 9, 2023
f5266a0
fix: set entrepreneurs as starting party
DZappala Jul 9, 2023
c3b6bae
fix: banned narcotics in france
DZappala Jul 9, 2023
1bf0d77
fix: remove unsupported unicode characters
DZappala Jul 11, 2023
eb85e9f
fix: correct igs for fra characters
DZappala Jul 11, 2023
5f765de
Merge branch 'dev' of https://github.com/Cold-War-Project/CWP-Main in…
DZappala Jul 11, 2023
cf5e437
chore: add more tooltip macros
DZappala Jul 11, 2023
f2271d2
fix: borken loc
DZappala Jul 11, 2023
0d30be8
feat: flavor law event initialization
DZappala Jul 12, 2023
cf520aa
feat: fix button loc switcher
DZappala Jul 12, 2023
1037caf
first try at dynamic team opinion
ademblon Jul 12, 2023
abc9b51
Ideology :
Jul 12, 2023
52b5f7d
add securocrats to the gaullist team
Jul 12, 2023
e274c24
feat: preliminary localization
DZappala Jul 12, 2023
607c309
added a script value for every team - law combination.
ademblon Jul 13, 2023
1a05108
fix: someone had it backwards
Jul 13, 2023
969202f
Merge branch 'dev' into french-content
Jul 13, 2023
792607b
chore: spelling
DZappala Jul 13, 2023
cd3d163
changed De Gaulle's IG to securocrats, changed party names accordingly.
BelHms Jul 14, 2023
d22e609
created "french resistant" trait and added localization
BelHms Jul 14, 2023
fcf1878
updated and added some characters, however most seem unable to spawn …
BelHms Jul 14, 2023
e40b391
feat: add new tooltip loc for new system
DZappala Jul 16, 2023
8e3d926
Merge branch 'dev' into french-content
Max200012 Jul 19, 2023
8e67f5d
Merge branch 'dev' into french-content
Jul 21, 2023
9bfc9e1
Merge branch 'dev' into french-content
Jul 22, 2023
3add516
feat: flavor events and weights
DZappala Jul 26, 2023
82d2a4c
feat: fra event loc
DZappala Jul 26, 2023
7ac3807
fix: charles tillon is no longer ig leader
BelHms Jul 26, 2023
bad104a
fix: added localisation for a new constitution je
BelHms Jul 26, 2023
5127c7c
Merge branch 'dev' into french-content
Jul 26, 2023
58e602f
Merge remote-tracking branch 'origin/french-content' into french-content
BelHms Jul 27, 2023
c5dc186
feat: added default options the fra a_new_constitution je
BelHms Jul 27, 2023
db3a2f4
Merge branch 'dev' of https://github.com/Cold-War-Project/CWP-Main in…
DZappala Jul 28, 2023
646bbd4
fix: french flavor events should trigger now
DZappala Jul 28, 2023
ecdb27b
fix: french events now work properly
DZappala Jul 28, 2023
a418176
Merge branch 'dev' of https://github.com/Cold-War-Project/CWP-Main in…
DZappala Jul 29, 2023
b70783b
Merge branch 'dev' of https://github.com/Cold-War-Project/CWP-Main in…
DZappala Jul 30, 2023
6f44843
fix: law events now trigger properly
DZappala Jul 30, 2023
0a7388f
chore: cleaned up unused code
DZappala Jul 30, 2023
bda7924
chore: standardized mathematical operators
DZappala Jul 30, 2023
28fe6d3
fix: IG weight is now calculated correctly
DZappala Jul 30, 2023
ba79fb4
fix: broken tooltip
DZappala Jul 30, 2023
547a1aa
feat: removed scripted buttons, didn't fit gameplay loop
DZappala Jul 30, 2023
d78e949
fix: people hate compromise a bit more.
DZappala Jul 30, 2023
2b13928
fix: incorrect date trigger
DZappala Jul 30, 2023
0e738e8
fix: comparators for JE outcome
DZappala Jul 30, 2023
a2fd944
feat: added new status desc
DZappala Jul 30, 2023
d071c29
moved activists and generals from history to character templates
BelHms Jul 30, 2023
84c936b
perfect balance
DZappala Jul 30, 2023
3cbd9cf
Merge branch 'french-content' of https://github.com/Cold-War-Project/…
DZappala Jul 30, 2023
aeac9b4
Merge branch 'dev' into french-content
Aug 1, 2023
2c0aeaa
Merge branch 'dev' into french-content
DZappala Aug 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore: metadata
  • Loading branch information
@DZappala
DZappala committed Jul 4, 2023
commit a47df6e655d2de3d77cd3da1c6783fdc56b3f04f
3 changes: 3 additions & 0 deletions .metadata/metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
"game_custom_data": {
"multiplayer_synchronized": true,
"replace_paths": [
"common/alert_groups",
"common/alert_types",
"common/achievements",
"common/coat_of_arms",
"common/cultures",
Expand Down Expand Up @@ -37,6 +39,7 @@
"common/journal_entries",
"common/law_groups",
"common/laws",
"common/messages",
"common/objective_subgoals",
"common/objectives",
"common/parties",
Expand Down